tbb-commits September 2014

tbb-commits@lists.torproject.org

2 participants
83 discussions

[tor-browser-bundle/master] Bug 12462: Enable HTTPSHandler in Python.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 96483cc6a8075d29a4715d3d389dbc4dbe4f3623 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 16 14:15:37 2014 +0000 Bug 12462: Enable HTTPSHandler in Python. --- gitian/descriptors/linux/gitian-utils.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 074076e..35fb67b 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -22,6 +22,8 @@ packages: - "zlib1g-dev" - "libxml2-dev" - "libxslt-dev" +# Needed for passing the Python related part of configure in ESR 31. +- "libssl-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git"

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

[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] 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] 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] Use newer libfaketime (0.9.6).
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 82153228c675451dc5b37d8302beff0a93e981e4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 22 20:10:38 2014 +0000 Use newer libfaketime (0.9.6). libfaketime 0.8 breaks the ESR 31 build (see #12461 comment 8 and later and #12812 comment 8 for the gory details). We therefore use a newer version that provides us with an environment variable to skip certain processes when faking time. --- gitian/descriptors/linux/gitian-firefox.yml | 33 +++++++++++++++++++++---- gitian/descriptors/mac/gitian-firefox.yml | 29 ++++++++++++++++++---- gitian/descriptors/windows/gitian-firefox.yml | 22 ++++++++++++++--- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.nightly | 1 + 8 files changed, 76 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 07927fb..d7958b0 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -6,7 +6,6 @@ architectures: - "i386" - "amd64" packages: -- "faketime" - "unzip" - "zip" - "libglib2.0-dev" @@ -32,6 +31,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "binutils-linux32-utils.zip" - "binutils-linux64-utils.zip" @@ -49,8 +50,6 @@ script: | export CFLAGS="-frandom-seed=tor" export CXXFLAGS="-frandom-seed=tor" export TZ=UTC - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export LC_ALL=C umask 0022 # @@ -92,18 +91,42 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $INSTDIR/Debug/Browser/components - # + + # Building libfaketime + cd faketime + make + DESTDIR="$INSTDIR/faketime" make install + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME=$REFERENCE_DATETIME + cd .. + cd tor-browser # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + # We need libfaketime for all the timestamps e.g. written into the libraries. + # BUT we need to exclude |make build| from it. Otherwise the build fails close + # to the end, see #12461 comment 8 and later. Additionally, we need to avoid + # breaking the ICU compilation. Exlcuding |bash| helps here. See #12461 + # comment 13. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME_SKIP_CMDS="bash,make" find -type f | xargs touch --date="$REFERENCE_DATETIME" - # make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + # Packaging is broken with libfaketime enabled, thus we disable it again. See + # #12461 comments 11 and 12 for details. + export LD_PRELOAD="" make -C obj-* package INNER_MAKE_PACKAGE=true + # Without libfaketime enabled we would get different omni.ja and *debug.zip + # files. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $INSTDIR/Browser/firefox-bin diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 40693b0..b07a261 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -10,12 +10,13 @@ packages: - "zip" - "autoconf" - "autoconf2.13" -- "faketime" - "yasm" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "x86_64-apple-darwin10.tar.xz" @@ -26,15 +27,21 @@ 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 # mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/ mkdir -p $OUTDIR/ - # + + # Building libfaketime. + cd faketime + make + DESTDIR="$INSTDIR/faketime" make install + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME=$REFERENCE_DATETIME + cd .. + sudo dpkg -i *.deb tar -xavf x86_64-apple-darwin10.tar.xz # XXX: Needed for the otool patch. But we should replace that one with a @@ -57,9 +64,21 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" 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" - # + # We need libfaketime for all the timestamps e.g. written into the libraries. + # BUT we need to exclude |make build| from it. Otherwise the build fails close + # to the end, see #12812 comment 6 and #12461 comment 8 and later. + # Additionally, we need to exclude |rsync| due to #10153 which is reproducible + # reliably with the new libfaketime. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + # XXX Order matters as for some reason the env variable has only the first + # command assigned when it comes to the rsync parts in the build process. + export FAKETIME_SKIP_CMDS="rsync,make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index da0c8b1..bcffffe 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -9,12 +9,13 @@ packages: - "zip" - "autoconf" - "autoconf2.13" -- "faketime" - "yasm" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "mingw-w64-win32-utils.zip" - "re-dzip.sh" @@ -28,8 +29,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 @@ -41,6 +40,14 @@ script: | # Make sure our custom mingw gets used. export PATH=$INSTDIR/mingw-w64/bin:$PATH + # Building libfaketime + cd faketime + make + DESTDIR="$INSTDIR/faketime" make install + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME=$REFERENCE_DATETIME + cd .. + # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec sed 's/msvcrt/msvcr100/' -i msvcr100.spec @@ -71,6 +78,10 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" 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" # @@ -78,6 +89,11 @@ script: | cp ~/build/i686* ~/build/bin/ export PATH=~/build/bin:$PATH # + # We need libfaketime for all the timestamps e.g. written into the libraries. + # BUT we need to exclude |make build| from it. Otherwise the build fails close + # to the end, see #12811 comment 14 and #12461 comment 8 and later. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME_SKIP_CMDS="make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index ad82ddf..3a4dc87 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -294,6 +294,7 @@ libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG txsocksx https://github.com/habnabit/txsocksx.git $TXSOCKSX_TAG goptlib https://git.torproject.org/pluggable-transports/goptlib.git $GOPTLIB_TAG meek https://git.torproject.org/pluggable-transports/meek.git $MEEK_TAG +faketime https://github.com/wolfcw/libfaketime $FAKETIME_TAG EOF exit 0 diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 8a4e55f..4106e74 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -197,7 +197,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (3/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index d71c824..9a43685 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -165,7 +165,7 @@ then echo "****** Starting TorBrowser Component of Mac Bundle (3/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index d7fc722..56830a0 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -168,7 +168,7 @@ then echo "****** Starting Torbrowser Component of Windows Bundle (3/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 58d647f..a59e8a1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -27,6 +27,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=master MEEK_TAG=master +FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7

1 0

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

30 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] Bug 10716: Take care of drag/drop events in ESR 31.
by mikeperry＠torproject.org 30 Sep '14

30 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

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

30 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 30 Sep '14

30 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

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits September 2014