- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Package clean-up in descriptors.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 232148eea6b7ce3816da757eb2532d0d40dc7050 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 19 13:26:59 2014 +0000 Package clean-up in descriptors. --- gitian/descriptors/linux/gitian-bundle.yml | 7 ++----- gitian/descriptors/linux/gitian-firefox.yml | 12 ++---------- gitian/descriptors/linux/gitian-pluggable-transports.yml | 9 ++++----- gitian/descriptors/linux/gitian-tor.yml | 9 +++------ gitian/descriptors/linux/gitian-utils.yml | 8 ++------ gitian/descriptors/mac/gitian-bundle.yml | 12 +++++------- gitian/descriptors/mac/gitian-firefox.yml | 6 ++---- gitian/descriptors/mac/gitian-pluggable-transports.yml | 10 ++++------ gitian/descriptors/mac/gitian-tor.yml | 8 ++------ gitian/descriptors/mac/gitian-utils.yml | 8 ++------ gitian/descriptors/windows/gitian-bundle.yml | 4 +--- gitian/descriptors/windows/gitian-firefox.yml | 6 ++---- gitian/descriptors/windows/gitian-pluggable-transports.yml | 11 ++++------- gitian/descriptors/windows/gitian-tor.yml | 8 ++------ gitian/descriptors/windows/gitian-utils.yml | 12 ++++-------- 15 files changed, 41 insertions(+), 89 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index d3b030c..19233b6 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -6,13 +6,10 @@ architectures: - "i386" - "amd64" packages: -- "git-core" +- "faketime" - "unzip" - "zip" -- "faketime" -- "python" -- "rnv" -- "xz-utils" +# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. - "libxslt1.1" - "sqlite3" reference_datetime: "2000-01-01 00:00:00" diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d7958b0..5d47b96 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -8,21 +8,13 @@ architectures: packages: - "unzip" - "zip" -- "libglib2.0-dev" +- "autoconf2.13" - "libgtk2.0-dev" -- "libdbus-1-dev" - "libdbus-glib-1-dev" - "yasm-1" - "libasound2-dev" -- "libcurl4-openssl-dev" -- "libxt-dev" -- "mesa-common-dev" -- "autoconf" -- "autoconf2.13" -- "libtool" -- "libiw-dev" -- "hardening-wrapper" - "libgstreamer-plugins-base0.10-dev" +- "hardening-wrapper" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index f9e2b51..7e23ec5 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -6,14 +6,13 @@ architectures: - "i386" - "amd64" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "swig" -- "m4" - "python-setuptools" - "python-dev" -- "faketime" +# Needed by M2Crypto +- "swig" +- "zip" - "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 2dccff6..aad9368 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -6,16 +6,13 @@ architectures: - "i386" - "amd64" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" - "automake" -- "faketime" - "libtool" -- "hardening-wrapper" - "zlib1g-dev" +- "zip" +- "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 59ef707..0c5e38c 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -6,14 +6,10 @@ architectures: - "i386" - "amd64" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" -- "automake" - "faketime" +- "automake" - "libtool" +- "zip" - "hardening-wrapper" # Needed for compiling gold. - "bison" diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index bd8bb5d..82b6595 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -5,19 +5,17 @@ suites: architectures: - "amd64" packages: -- "git-core" +- "faketime" - "unzip" - "zip" -- "faketime" -- "python" -- "hfsprogs" +# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +- "python-lxml" +- "sqlite3" +# Needed for the .dmgs - "genisoimage" - "cmake" - "zlib1g-dev" - "libbz2-dev" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. -- "python-lxml" -- "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index b07a261..fc36472 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -5,12 +5,10 @@ suites: architectures: - "amd64" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" - "autoconf2.13" +- "unzip" - "yasm" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d0322f8..33df49f 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -5,15 +5,13 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "swig" -- "m4" - "python-setuptools" - "python-dev" -- "faketime" -- "libtool" +# Needed by M2Crypto +- "swig" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index ee8a556..6022c0b 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -5,14 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" - "automake" -- "faketime" -- "libtool" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 3c6e4a7..785d88c 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -5,14 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" -- "automake" - "faketime" +- "automake" - "libtool" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 2d50f9c..76f5c67 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -5,12 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" - "zip" - "nsis" -- "faketime" -- "python" # Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. - "python-lxml" - "sqlite3" diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index bcffffe..07c082b 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -4,12 +4,10 @@ suites: architectures: - "i386" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" - "autoconf2.13" +- "unzip" - "yasm" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 93776b8..6a6301d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -5,15 +5,12 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "swig" - "p7zip-full" -- "m4" -- "python-dev" -- "faketime" -- "libtool" +# Needed by M2Crypto +- "swig" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index c326157..0ac603c 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -5,14 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "autoconf" - "automake" -- "autoconf2.13" -- "faketime" -- "libtool" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 75e5662..f0deca0 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -5,15 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" -- "automake" -- "mingw-w64" - "faketime" +- "automake" - "libtool" +- "zip" # XXX: Only needed to dump the spec. - "g++-mingw-w64-i686" # Needed for compiling gcc. @@ -47,8 +42,9 @@ script: | cd binutils* # XXX: This is needed due to bug 10102. sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c - # Zeroing timestamps in PE headers reliably, see bug 12753. + # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch + # Zeroing timestamps in PE headers reliably, see bug 12753. patch -p1 < ../peXXigen.patch ./configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib make $MAKEOPTS

1 0

[tor-browser-bundle/master] Bump NoScript version in nghtly builds.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 0c0e32b86f51f8b971e867c320daca51d96798db Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 30 09:16:04 2014 +0000 Bump NoScript version in nghtly builds. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a59e8a1..0617ea7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -54,7 +54,7 @@ GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.41-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -82,7 +82,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ac8b2febff44a437e00bd261570af9f7aba8cc2f49e69ffb631a0578af6facc1 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] mbsdiff is not linked as mbsdiff.exe anymore.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 0155dc71e24f434cb463062d1b22eca50d5aabd5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 12 10:02:23 2014 +0000 mbsdiff is not linked as mbsdiff.exe anymore. This got fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=933120. --- gitian/descriptors/windows/gitian-firefox.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 2975ab5..da0c8b1 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -95,14 +95,12 @@ script: | 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/ + cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd ~/build zip -r mar-tools-win32.zip mar-tools cp mar-tools-win32.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Bug 12461: New compiler for Tor Browser ESR 31.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 0d36f05505208e8c46ece532c9cb455cde31c417 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 10:43:13 2014 +0000 Bug 12461: New compiler for Tor Browser ESR 31. Tor Browser based on Firefox ESR 31 needs a newer compiler. GCC 4.4 is not supported anymore. We chose the latest GCC (4.9.1) as we don't want to bump the version again when we start deploying hardened builds. --- RelativeLink/RelativeLink.sh | 2 +- gitian/descriptors/linux/gitian-firefox.yml | 22 +++++++++++++++++++--- gitian/descriptors/linux/gitian-utils.yml | 21 +++++++++++++++++++-- gitian/gpg/GCC.gpg | Bin 9931 -> 2635 bytes gitian/mkbundle-linux.sh | 6 ++++++ gitian/versions.nightly | 2 +- 6 files changed, 46 insertions(+), 7 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index e75482a..88f9f8e 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -215,7 +215,7 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then exit 1 fi -LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" +LD_LIBRARY_PATH="${HOME}:${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH function setControlPortPasswd() { diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 4284a5d..633444d 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -26,6 +26,8 @@ packages: - "libgstreamer-plugins-base0.10-dev" # To pass configure since ESR 31. - "libpulse-dev" +# We built GCC but not the libmpc2, thus we need to install it. +- "libmpc2" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" @@ -33,6 +35,8 @@ remotes: files: - "binutils-linux32-utils.zip" - "binutils-linux64-utils.zip" +- "gcc-linux32-utils.zip" +- "gcc-linux64-utils.zip" - "python-linux32-utils.zip" - "python-linux64-utils.zip" - "re-dzip.sh" @@ -60,12 +64,12 @@ script: | mkdir -p $INSTDIR/build/bin/ ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm export PATH=$PATH:$INSTDIR/build/bin - # Preparing Python for Firefox + # Preparing Python for Tor Browser unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip # TODO: We might want to have a smarter solution than hard-coding the version. ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python export PATH=$INSTDIR/python/bin:$PATH - # + # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see # #13031. @@ -76,7 +80,16 @@ script: | ln -sf hardened-ld ld.gold ln -sf ld.gold ld cd ~/build - export PATH=$INSTDIR/binutils/bin:$PATH + unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip + export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + ARCH="" + if [ $GBUILD_BITS == "64" ]; + then + ARCH="64" + fi + # Make sure our GCC gets properly used. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH + # mkdir -p $INSTDIR/Browser/ mkdir -p $INSTDIR/Debug/Browser/components # @@ -119,6 +132,9 @@ script: | strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB done + # We need to copy the libstdc++.so.6 for older Linux distros. + cp $INSTDIR/gcc/lib$ARCH/libstdc++.so.6 Browser + # ~/build/re-dzip.sh Browser/omni.ja ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 35fb67b..59ef707 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -17,6 +17,8 @@ packages: - "hardening-wrapper" # Needed for compiling gold. - "bison" +# Needed for compiling GCC. +- "libmpc-dev" # These packages are needed for Python due to HTTPS-Everywhere >= 3.5. - "libsqlite3-dev" - "zlib1g-dev" @@ -30,6 +32,7 @@ remotes: "dir": "libevent" files: - "binutils.tar.bz2" +- "gcc.tar.bz2" - "openssl.tar.gz" - "python.tar.bz2" - "lxml.tar.gz" @@ -39,8 +42,6 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -64,6 +65,21 @@ script: | make install cd .. + # Building GCC + tar xjf gcc.tar.bz2 + cd gcc-* + ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + make $MAKEOPTS + make install + cd .. + + # libfaketime gets into our way when building GCC 4.9.x. See: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we + # avoid it for the toolchain and cross our fingers. + # TODO: Test a newer libfaketime than 0.8. + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME + # Building Libevent cd libevent ./autogen.sh @@ -122,6 +138,7 @@ script: | # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh binutils-$BINUTILS_VER-linux$GBUILD_BITS-utils.zip binutils + ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python diff --git a/gitian/gpg/GCC.gpg b/gitian/gpg/GCC.gpg index d94d692..e62de27 100644 Binary files a/gitian/gpg/GCC.gpg and b/gitian/gpg/GCC.gpg differ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index c4938d0..8a4e55f 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -100,6 +100,8 @@ cd $GITIAN_DIR if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ + ! -f inputs/gcc-$GCC_VER-linux32-utils.zip -o \ + ! -f inputs/gcc-$GCC_VER-linux64-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip -o \ @@ -126,6 +128,8 @@ then cp -a ../build/out/*-utils.zip . ln -sf binutils-$BINUTILS_VER-linux32-utils.zip binutils-linux32-utils.zip ln -sf binutils-$BINUTILS_VER-linux64-utils.zip binutils-linux64-utils.zip + ln -sf gcc-$GCC_VER-linux32-utils.zip gcc-linux32-utils.zip + ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux32-utils.zip openssl-linux32-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip @@ -147,6 +151,8 @@ else cd inputs ln -sf binutils-$BINUTILS_VER-linux32-utils.zip binutils-linux32-utils.zip ln -sf binutils-$BINUTILS_VER-linux64-utils.zip binutils-linux64-utils.zip + ln -sf gcc-$GCC_VER-linux32-utils.zip gcc-linux32-utils.zip + ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux32-utils.zip openssl-linux32-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4d4c4f5..5032058 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -34,7 +34,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=4.8.3 +GCC_VER=4.9.1 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1

1 0

[torbutton/master] Comment that the on-datatransfer-available API is the new one.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 6961e6b8ccd8846638be39a426f42c61f013fc47 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:46:33 2014 -0700 Comment that the on-datatransfer-available API is the new one. --- src/components/external-app-blocker.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index aed25ce..cabd72b 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -205,6 +205,8 @@ ExternalWrapper.prototype = }, observe: function(subject, topic, data) { + // XXX: The on-modify-drag-list is TBB specific and can be removed. + // FF31 added the on-datatransfer-available observer instead. if (topic == "on-modify-drag-list") { this.logger.log(3, "Got drag observer event"); try {

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_10716_v2'
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit eac0d3eefa335b8648acf5ca785cc56224e3dd9e Merge: beb9d71 ca82201 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:44:23 2014 -0700 Merge remote-tracking branch 'gk/bug_10716_v2' src/components/external-app-blocker.js | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Update changelog.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 6cbdecfce8649b334c05c45689d9e660b6032fb9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:44:45 2014 -0700 Update changelog. --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 74e95fe..0d68ab6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -3,6 +3,7 @@ * Bug 10751: Adapt Torbutton to ESR31's Australis UI. * Bug 13138: ESR31-about:tor shows "Tor is not working" * Bug 12947: Adapt session storage blocker to ESR 31. + * Bug 10716: Take care of drag/drop events in ESR 31. 1.6.12.3 23 Sep 2014

1 0

[torbutton/master] Bug 10716: Take care of drag/drop events in ESR 31.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit ca8220118f1e3ac3ed190cc15f1091f285cf299a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 18 13:14:36 2014 +0000 Bug 10716: Take care of drag/drop events in ESR 31. --- src/components/external-app-blocker.js | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 38ddcd7..aed25ce 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -61,6 +61,7 @@ function ExternalWrapper() { var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); observerService.addObserver(this, "on-modify-drag-list", false); + observerService.addObserver(this, "on-datatransfer-available", false); } catch(e) { this.logger.log(5, "Failed to register drag observer"); } @@ -204,7 +205,7 @@ ExternalWrapper.prototype = }, observe: function(subject, topic, data) { - if(topic == "on-modify-drag-list") { + if (topic == "on-modify-drag-list") { this.logger.log(3, "Got drag observer event"); try { subject.QueryInterface(Ci.nsISupportsArray); @@ -213,6 +214,9 @@ ExternalWrapper.prototype = } return this.filterDragURLs(subject); + } else if (topic == "on-datatransfer-available") { + this.logger.log(3, "The DataTransfer is available"); + return this.filterDataTransferURLs(subject); } }, @@ -226,7 +230,7 @@ ExternalWrapper.prototype = .QueryInterface(Ci.nsISupportsArray); for (var f=0; f < flavors.Count(); f++) { - var flavor =flavors.GetElementAt(f); + var flavor =flavors.GetElementAt(f); flavor.QueryInterface(Ci.nsISupportsCString); this.logger.log(3, "Got drag+drop flavor: "+flavor); @@ -241,6 +245,29 @@ ExternalWrapper.prototype = } }, + filterDataTransferURLs: function(aDataTransfer) { + var types = null; + var type = ""; + var count = aDataTransfer.mozItemCount; + var len = 0; + for (var i = 0; i < count; ++i) { + this.logger.log(3, "Inspecting the data transfer: " + i); + types = aDataTransfer.mozTypesAt(i); + len = types.length; + for (var j = 0; j < len; ++j) { + type = types[j]; + this.logger.log(3, "Type is: " + type); + if (type == "text/x-moz-url" || + type == "text/x-moz-url-data" || + type == "text/uri-list" || + type == "application/x-moz-file-promise-url") { + aDataTransfer.clearData(type); + this.logger.log(3, "Removing " + type); + } + } + } + } + }; var ExternalWrapperSingleton = null;

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 3a25e7d56006b2ddfcd30cd310df87d9e09f6d3c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:34:57 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 13023: Disable the gamepad API. --- 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 9739f87..c885dae 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -76,6 +76,7 @@ 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("dom.gamepad.enabled", false); // bugs.torproject.org/13023 // 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] Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 11d174291621350e9f5524ee416c74597ccef660 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:26:42 2014 -0700 Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 26fd819..cddc237 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,14 +4,6 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); -// Make TLSv1.0 the maximum TLS version, as in stock Firefox 24. Since #11253, -// Tor Browser overrides the maximum to TLSv1.2, which would cause us to look -// unlike ordinary Firefox 24. -// https://trac.torproject.org/projects/tor/ticket/11253 -// https://trac.torproject.org/projects/tor/ticket/12766 -// http://kb.mozillazine.org/Security.tls.version.* -user_pref("security.tls.version.max", 1); - // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9

1 0

[tor-browser-bundle/master] Point nightlies at FF31ESR.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit d6cbef12af2a177cb8d715c00bc9c3f1fa81f5b5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:53:39 2014 -0700 Point nightlies at FF31ESR. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1d3285d..4d4c4f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.8.0esr +FIREFOX_VERSION=31.1.1esr TORBROWSER_UPDATE_CHANNEL=default @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=master MEEK_TAG=master -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[torbutton/master] Bug 12947: Adapt session storage blocker to ESR 31.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 3831da21b6bac9e6cf21ba7d4e48217a6b14e73a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 5 16:12:23 2014 +0000 Bug 12947: Adapt session storage blocker to ESR 31. --- src/components/tbSessionStore.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/tbSessionStore.js b/src/components/tbSessionStore.js index 039e223..7281bcf 100644 --- a/src/components/tbSessionStore.js +++ b/src/components/tbSessionStore.js @@ -85,8 +85,15 @@ TBSessionBlocker.prototype = { if (topic != "sessionstore-state-write") return; this.logger.log(3, "Got Session Store observe: "+topic); - subject = subject.QueryInterface(Ci.nsISupportsString); - + // In ESR 31 |subject| is |null| in non-private browsing mode. Thus, we + // are not able to clean anything. In Private Browsing Mode nothing is + // written in the first place and therefore no |sessionstore-state-write| + // notification is emitted. + try { + subject = subject.QueryInterface(Ci.nsISupportsString); + } catch (e) { + this.logger.log(3, "We got no data to clean"); + } // Bug 1506: This is the only important bit, other than // the registration goop. You don't even need the JSON // garbage...

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_12947'
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit fd5b793ce1d1922411cf632bd0a53139e26efdc8 Merge: 3f80c17 3831da2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:25:27 2014 -0700 Merge remote-tracking branch 'gk/bug_12947' src/components/tbSessionStore.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Update changelog.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit beb9d71b5a101523474e9c72ff75419065ccd326 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:25:37 2014 -0700 Update changelog. --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 11c50a7..74e95fe 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -2,6 +2,7 @@ ?? * Bug 10751: Adapt Torbutton to ESR31's Australis UI. * Bug 13138: ESR31-about:tor shows "Tor is not working" + * Bug 12947: Adapt session storage blocker to ESR 31. 1.6.12.3 23 Sep 2014

1 0

[torbutton/master] Bug 13138: ESR31-about:tor shows "Tor is not working"
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 0467379f524273ed810b5c21d6a8eb16d00445cb Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 11 14:10:55 2014 -0400 Bug 13138: ESR31-about:tor shows "Tor is not working" In Firefox 26 and newer, the BrowserOnAboutPageLoad() function that Torbutton previously used to detect about:tor page loads has been removed. The new approach is to have about:tor dispatch a custom event (which is the same approach Mozilla uses for about:home). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 ++++++- src/chrome/content/torbutton.js | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index f8f829d..c13f60e 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -21,7 +21,7 @@ <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="chrome://torbutton/skin/aboutTor.css"/> -<script type="text/javascript"> +<script type="text/javascript;version=1.7"> <![CDATA[ function onLoad() { @@ -125,6 +125,11 @@ function insertPropertyStrings() } catch(e) {}; } +window.addEventListener("pageshow", function() { + let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); + document.dispatchEvent(evt); +}); + ]]> </script> </head> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4ca6614..9b7ade2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -506,9 +506,10 @@ function torbutton_init() { } } - // Add our hook into about page load - m_tb_orig_BrowserOnAboutPageLoad = window.BrowserOnAboutPageLoad; - window.BrowserOnAboutPageLoad = torbutton_override_BrowserOnAboutPageLoad; + // Add event listener for about:tor page loads. + document.addEventListener("AboutTorLoad", function(aEvent) { + torbutton_on_abouttor_load(aEvent.target); + }, false, true); // initialize preferences before we start our prefs observer torbutton_init_prefs(); @@ -966,7 +967,7 @@ function torbutton_update_abouttor_arrow(aDoc) { } catch(e) {} } -function torbutton_override_BrowserOnAboutPageLoad(aDoc) { +function torbutton_on_abouttor_load(aDoc) { if (torbutton_is_abouttor_doc(aDoc) && !aDoc.documentElement.hasAttribute("aboutTorLoaded")) { aDoc.documentElement.setAttribute("aboutTorLoaded", true);

1 0

[torbutton/master] Bug #10751.2: Adapt Torbutton to Australis UI.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 4024c6ff958724d226a5a30b68316b25fb876616 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 25 16:46:54 2014 -0700 Bug #10751.2: Adapt Torbutton to Australis UI. Use CustomizableUI, if it is available, to add TorButton's button to navigation toolbar. --- src/chrome/content/torbutton.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 153cc3c..4ca6614 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -541,14 +541,21 @@ function torbutton_init() { if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button")) { torbutton_log(3, 'Adding button'); try { - var toolbutton = torbutton_get_button_from_toolbox(); - var navbar = document.getElementById("nav-bar"); - // XXX: Will probably fail on fennec. Also explicitly forbidden - // by MDC style guides (for good reason). Fix later.. - var urlbar = document.getElementById("urlbar-container"); - navbar.insertBefore(toolbutton, urlbar); - navbar.setAttribute("currentset", navbar.currentSet); - document.persist("nav-bar", "currentset"); + if (CustomizableUI) { + // ESR31-style toolbar + CustomizableUI.addWidgetToArea("torbutton-button", CustomizableUI.AREA_NAVBAR, 0); + } else { + // ESR24-style toolbar + // TODO: Remove this branch once TBB-ESR24 has been retired. + var toolbutton = torbutton_get_button_from_toolbox(); + var navbar = document.getElementById("nav-bar"); + // XXX: Will probably fail on fennec. Also explicitly forbidden + // by MDC style guides (for good reason). Fix later.. + var urlbar = document.getElementById("urlbar-container"); + navbar.insertBefore(toolbutton, urlbar); + navbar.setAttribute("currentset", navbar.currentSet); + document.persist("nav-bar", "currentset"); + } torbutton_log(3, 'Button added'); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); } catch(e) {

1 0

[torbutton/master] Bug #10751.1: Load HUDService only if it's not already available.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit f5095267fcc638bd5ded6f9934e31d98505a6247 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 25 15:50:19 2014 -0700 Bug #10751.1: Load HUDService only if it's not already available. Loading by this method breaks the browser console in ESR31. Fortunately, ESR31 has a built-in window.HUDService. --- src/chrome/content/torbutton.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4cd9c3d..153cc3c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -6,8 +6,13 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -XPCOMUtils.defineLazyModuleGetter(this, "HUDService", - "resource:///modules/HUDService.jsm"); +// TODO: Remove the following HUDService loading code once TBB-ESR24 has +// been retired. +if (!window.hasOwnProperty("HUDService")) { + XPCOMUtils.defineLazyModuleGetter(this, "HUDService", + "resource:///modules/HUDService.jsm"); +} + XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", @@ -2605,8 +2610,8 @@ var torbutton_console_observer = { observe: function(subject, topic, data) { if (topic === "web-console-created") { - var id = subject.QueryInterface(Ci.nsISupportsString).toString(); - var con = HUDService.getHudReferenceById(subject); + var id = subject.QueryInterface(Ci.nsISupportsString).toString(), + con = HUDService.getHudReferenceById(id); con.ui.reportPageErrorOld = con.ui.reportPageError; // Filtering the messages by making them hidden adding the // "hidden-message" class. If the message does not need to get filtered

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug13138'
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit f82606e56c30ee7db9e6160719ef858b7b9c1e10 Merge: 7f46869 0467379 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:06:48 2014 -0700 Merge remote-tracking branch 'brade/bug13138' src/chrome/content/aboutTor/aboutTor.xhtml | 7 ++++- src/chrome/content/torbutton.js | 45 ++++++++++++++++++---------- 2 files changed, 35 insertions(+), 17 deletions(-)

1 0

[torbutton/master] Update changelog and version for 1.7.0.0-pre.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 3f80c17eb67f2836c1652f43f693e0a99c152747 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:22:56 2014 -0700 Update changelog and version for 1.7.0.0-pre. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 1f925c6..11c50a7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.7.0.0 + ?? + * Bug 10751: Adapt Torbutton to ESR31's Australis UI. + * Bug 13138: ESR31-about:tor shows "Tor is not working" + 1.6.12.3 23 Sep 2014 * Bug 10804: Workaround for some TBB startup hangs diff --git a/src/install.rdf b/src/install.rdf index bf5ec16..2411179 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.12.3</em:version> + <em:version>1.7.0.0-pre</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Add the update responses script
by gk＠torproject.org 26 Sep '14

26 Sep '14

commit c2b76dcc4a854d7cecb44acac2bea1cf23cf51e6 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Thu Sep 25 19:39:19 2014 +0200 Add the update responses script Add the update responses script in directory tools/update-responses. This adds the content of commit 2c3625507a5c12b4c15b6681a8b694114a0cfb7b from https://github.com/boklm/tb-update-response. --- tools/update-responses/.gitignore | 1 + tools/update-responses/README.md | 45 +++++++ tools/update-responses/config.yml | 16 +++ tools/update-responses/htdocs/no-update.xml | 2 + tools/update-responses/update_responses | 169 +++++++++++++++++++++++++++ 5 files changed, 233 insertions(+) diff --git a/tools/update-responses/.gitignore b/tools/update-responses/.gitignore new file mode 100644 index 0000000..c077014 --- /dev/null +++ b/tools/update-responses/.gitignore @@ -0,0 +1 @@ +htdocs diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md new file mode 100644 index 0000000..ee21bac --- /dev/null +++ b/tools/update-responses/README.md @@ -0,0 +1,45 @@ +Tor Browser Update Responses script +=================================== + +This repository contains a script to generate responses for Tor Browser +updater. + +See ticket [#12622](https://trac.torproject.org/projects/tor/ticket/12622) +for details. + + +Dependencies +------------ + +The following perl modules need to be installed to run the script: + FindBin YAML File::Slurp Digest::SHA XML::Writer + +On Debian / Ubuntu you can install them with: + +``` + # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ + libdigest-sha-perl libxml-writer-perl +``` + +On Red Hat / Fedora you can install them with: + +``` + # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer + do yum install "perl($module)"; done +``` + + +URL Format +---------- + +The URL format is: + https://something/$channel/$build_target/$tb_version/$lang?force=1 + +'build_target' is the OS for which the browser was built. The correspo +ndance between the build target and the OS name that we use in archive +files is defined in the config.yml file. + +'tb_version' is the Tor Browser version. + +'lang' is the locale. + diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml new file mode 100644 index 0000000..8b5475a --- /dev/null +++ b/tools/update-responses/config.yml @@ -0,0 +1,16 @@ +--- +build_targets: + linux32: Linux_x86-gcc3 + linux64: Linux_x86_64-gcc3 + win32: WINNT_x86-gcc3 + osx32: Darwin_x86-gcc3 +channels: + alpha: 4.0-alpha-3 +versions: + 4.0-alpha-3: + platformVersion: 24.8.1 + detailsURL: https://www.torproject.org/projects/torbrowser.html.en + download_url: https://www.torproject.org/dist/torbrowser/4.0-alpha-3 +# osx32: +# minSupportedOSVersion: 10.7 +# unsupported: 1 diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml new file mode 100644 index 0000000..910e99d --- /dev/null +++ b/tools/update-responses/htdocs/no-update.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates></updates> diff --git a/tools/update-responses/releases/.directory b/tools/update-responses/releases/.directory new file mode 100644 index 0000000..e69de29 diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses new file mode 100755 index 0000000..e082592 --- /dev/null +++ b/tools/update-responses/update_responses @@ -0,0 +1,169 @@ +#!/usr/bin/perl -w + +use strict; +use FindBin; +use YAML qw(LoadFile); +use File::Slurp; +use Digest::SHA; +use XML::Writer; + +my $htdocsdir = "$FindBin::Bin/htdocs"; +my $config = LoadFile("$FindBin::Bin/config.yml"); +my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + exit (exists $_[1] ? $_[1] : 1); +} + +sub build_target_by_os { + $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +} + +sub write_htdocs { + my ($file, $content) = @_; + mkdir $htdocsdir unless -d $htdocsdir; + write_file("$htdocsdir/$file", $content); + $htdocsfiles{$file} = 1; +} + +sub clean_htdocs { + opendir(my $d, $htdocsdir); + my @files = grep { ! $htdocsfiles{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$_" } @files; +} + +sub get_sha512_hex_of_file { + my ($file) = @_; + my $sha = Digest::SHA->new("512"); + $sha->addfile($file); + return $sha->hexdigest; +} + +sub get_version_files { + my ($config, $version) = @_; + return if $config->{versions}{$version}{files}; + my $files = {}; + my $vdir = "$FindBin::Bin/releases/$version"; + opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; + foreach my $file (readdir $d) { + next unless -f "$vdir/$file"; + if ($file =~ m/^tor-browser-([^-]+)-${version}_(.+)\.mar$/) { + my ($os, $lang) = ($1, $2); + $files->{$os}{$lang}{complete} = { + type => 'complete', + URL => "$config->{versions}{$version}{download_url}/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + }; + next; + } + if ($file =~ m/^tor-browser-([^-]+)-([^-]+)-${version}_(.+)\.mar$/) { + my ($os, $from_version, $lang) = ($1, $2, $3); + $files->{$os}{$lang}{partial}{$from_version} = { + type => 'partial', + URL => "$config->{versions}{$version}{download_url}/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + } + } + } + closedir $d; + $config->{versions}{$version}{files} = $files; +} + +sub get_config { + my ($config, $version, $os, $name) = @_; + return $config->{versions}{$version}{$os}{$name} + // $config->{versions}{$version}{$name} + // $config->{$name}; +} + +sub get_response { + my ($config, $version, $os, @patches) = @_; + my $res; + my $writer = XML::Writer->new(OUTPUT => \$res, ENCODING => 'UTF-8'); + $writer->xmlDecl; + $writer->startTag('updates'); + if (get_config($config, $version, $os, 'unsupported')) { + $writer->startTag('update', + unsupported => 'true', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + ); + goto CLOSETAGS; + } + my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + $writer->startTag('update', + type => 'minor', + displayVersion => $version, + appVersion => $version, + platformVersion => get_config($config, $version, $os, 'platformVersion'), + buildID => '20000101000000', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + ); + foreach my $patch (@patches) { + $writer->startTag('patch', %$patch); + $writer->endTag('patch'); + } + CLOSETAGS: + $writer->endTag('update'); + $writer->endTag('updates'); + $writer->end; + return $res; +} + +sub write_responses { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + my $files = $config->{versions}{$version}{files}; + foreach my $os (keys %$files) { + foreach my $lang (keys %{$files->{$os}}) { + my $resp = get_response($config, $version, $os, + $files->{$os}{$lang}{complete}); + write_htdocs("$version-$os-$lang.xml", $resp); + foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + $resp = get_response($config, $version, $os, + $files->{$os}{$lang}{complete}, + $files->{$os}{$lang}{partial}{$from_version}); + write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + } + } + } + } +} + +sub write_htaccess { + my ($config) = @_; + my $htaccess = "RewriteEngine On\n"; + my $flags = "[last]"; + foreach my $channel (keys %{$config->{channels}}) { + my $version = $config->{channels}{$channel}; + my $files = $config->{versions}{$version}{files}; + $htaccess .= "RewriteRule " + . "^$channel/[^\/]+/$version/ " + . "no-update.xml $flags\n"; + foreach my $os (keys %$files) { + my $bt = build_target_by_os($os); + foreach my $lang (keys %{$files->{$os}}) { + foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$channel/$bt " + . "$version-$os-en-US.xml $flags\n"; + } + } + write_htdocs('.htaccess', $htaccess); +} + +write_responses($config); +write_htaccess($config); +clean_htdocs;

1 0

[tor-browser-bundle/maint-3.6] Fix wrong changelog entry.
by gk＠torproject.org 26 Sep '14

26 Sep '14

commit e3cf791da65d0aca2fec7faac5a22a1954d44122 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 26 14:02:15 2014 +0000 Fix wrong changelog entry. --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e927d9c..916ad5d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,6 @@ Tor Browser Bundle 3.6.6 -- Sep 24 2014 * Bug 10804: Workaround fix for some cases of startup hang * Linux * Bug 9150: Make RPATH unavailable on Tor binary. - * Bug 13031: Add full RELRO protection. Tor Browser Bundle 3.6.5 -- Sep 2 2014 * All Platforms

1 0

[tor-browser-bundle/master] Bug 13245: Prevent non-english TBBs from upgrading to english version.
by mikeperry＠torproject.org 25 Sep '14

25 Sep '14

commit a92ec3e06a17f1a19c35590c8ad93081b180ef4e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 25 19:05:59 2014 -0700 Bug 13245: Prevent non-english TBBs from upgrading to english version. --- gitian/descriptors/linux/gitian-bundle.yml | 6 ++++++ gitian/descriptors/mac/gitian-bundle.yml | 6 ++++++ gitian/descriptors/windows/gitian-bundle.yml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 38882f3..d3b030c 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -183,6 +183,12 @@ script: | rm -rf defaults popd + # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + pushd tor-browser_$LANG/Browser/ + echo "$LANG" > update.locale + zip -Xm omni.ja update.locale + popd + # Recreate precomplete file (needs to be accurate for full MAR updates). pushd tor-browser_$LANG/Browser rm -f precomplete diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 9801826..bd8bb5d 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -227,6 +227,12 @@ script: | rm -rf defaults popd + # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + pushd ~/build/dmg/$DEST.app/Contents/MacOS/ + echo "$LANG" > update.locale + zip -Xm omni.ja update.locale + popd + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then pushd ~/build/dmg/ ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 79d6340..2d50f9c 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -162,6 +162,12 @@ script: | rm -rf defaults popd + # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + pushd "Tor Browser"/Browser/ + echo "$LANG" > update.locale + zip -Xm omni.ja update.locale + popd + # Recreate precomplete file (needs to be accurate for full MAR updates). pushd "Tor Browser"/Browser/ rm -f precomplete

1 0

[tor-browser-bundle/master] Update changelog for 4.0a3 (and fix 3.6.6 changelog for history).
by mikeperry＠torproject.org 25 Sep '14

25 Sep '14

commit 2e91690f2dac97c8ece8384b38085833a6ccb7e6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 25 19:07:26 2014 -0700 Update changelog for 4.0a3 (and fix 3.6.6 changelog for history). --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6f3ea04..82e8138 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -11,6 +11,7 @@ Tor Browser 4.0-alpha-3 -- Sep 24 2014 * Bug 13049: Browser update failure (self.update is undefined) * Bug 13047: Updater should not send Kernel and GTK version * Bug 12998: Prevent intermediate certs from being written to disk + * Bug 13245: Prevent non-english TBBs from upgrading to english version. * Linux: * Bug 9150: Make RPATH unavailable on Tor binary. * Bug 13031: Add full RELRO protection. @@ -27,7 +28,6 @@ Tor Browser Bundle 3.6.6 -- Sep 24 2014 * Bug 10804: Workaround fix for some cases of startup hang * Linux * Bug 9150: Make RPATH unavailable on Tor binary. - * Bug 13031: Add full RELRO protection. Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * All Platforms

1 0

[tor-browser-bundle/master] Use the commit for Tor Launcher as well.
by gk＠torproject.org 24 Sep '14

24 Sep '14

commit 72ec0faa93ceb840a897e2e6953334ced2a8ff7b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 24 15:03:46 2014 +0000 Use the commit for Tor Launcher as well. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index be1283f..c4938d0 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 286f860..d71c824 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -89,7 +89,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 520119b..d7fc722 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -82,7 +82,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index eb368a9..2c60e6e 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -36,7 +36,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0

[tor-browser-bundle/maint-3.6] Use the commit for Tor Launcher as well.
by gk＠torproject.org 24 Sep '14

24 Sep '14

commit 4fd2bc0dda2c3c510f8062d3420e9a3c8f6e94fc Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 24 15:00:03 2014 +0000 Use the commit for Tor Launcher as well. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index cdaf51d..e4a428b 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 3cd137b..c3dfb83 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -91,7 +91,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e582d17..4d24561 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -86,7 +86,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 29f1e34..8778eca 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -37,7 +37,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0