- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 16181: Gitian changes for ESR 38 on OS X
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit ff23e83bcc9e5ade5fcbf954c449446c4044df78 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 10:40:20 2015 +0000 Bug 16181: Gitian changes for ESR 38 on OS X --- gitian/descriptors/mac/gitian-bundle.yml | 86 ++++++++------------- gitian/descriptors/mac/gitian-firefox.yml | 46 ++++++------ gitian/descriptors/mac/gitian-utils.yml | 115 +++++++++++++++++------------ gitian/fetch-inputs.sh | 6 +- gitian/mkbundle-mac.sh | 5 +- gitian/patches/libfaketime.patch | 54 ++++++++++++++ gitian/verify-tags.sh | 4 +- gitian/versions | 6 +- gitian/versions.alpha | 6 +- gitian/versions.nightly | 6 +- 10 files changed, 196 insertions(+), 138 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 61a024b..255d327 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -64,13 +64,8 @@ script: | export TORBROWSER_VERSION=`cat bare-version` export LC_ALL=C umask 0022 - if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - export TORBROWSER_APP="TorBrowserBundle" - export TORBROWSER_NAME="TorBrowserBundle" - else - export TORBROWSER_APP="TorBrowser" - export TORBROWSER_NAME="TorBrowserBundle" - fi + export TORBROWSER_APP="TorBrowser" + export TORBROWSER_NAME="TorBrowserBundle" # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-mac$GBUILD_BITS.zip @@ -161,7 +156,7 @@ script: | tar -Jxvf ~/build/dmg-applications.tar.xz cd .. # - pushd $TORBROWSER_NAME.app/Contents/MacOS/browser/ + pushd $TORBROWSER_NAME.app/Contents/Resources/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. @@ -179,27 +174,21 @@ script: | unzip ~/build/TorBrowser.app.meek-http-helper.zip popd # - if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - cp -a ~/build/$TORBROWSER_NAME.app ~/build/${TORBROWSER_NAME}_en-US.app - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app - rm -rf ~/build/${TORBROWSER_NAME}_en-US.app - else - # XXX: We need to insert these placeholders because otherwise mkisofs won't - # include these otherwise empty dirs: - touch ~/build/$TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches/placeholder.txt - # Recreate precomplete file (needs to be accurate for full MAR updates). - pushd ~/build/$TORBROWSER_NAME.app/ - rm -f precomplete - python $MARTOOLS/createprecomplete.py - popd - # - # Create full MAR file and disk image. - MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/$TORBROWSER_NAME.app - cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app - ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg - rm -rf ~/build/dmg/$TORBROWSER_APP.app - fi + # XXX: We need to insert these placeholders because otherwise mkisofs won't + # include these otherwise empty dirs: + touch ~/build/$TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches/placeholder.txt + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd ~/build/$TORBROWSER_NAME.app/Contents/Resources/ + rm -f precomplete + python $MARTOOLS/createprecomplete.py + popd + # + # Create full MAR file and disk image. + MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/$TORBROWSER_NAME.app + cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg + rm -rf ~/build/dmg/$TORBROWSER_APP.app mv $TORBROWSER_NAME.app ${TORBROWSER_NAME}_plain.app # unzip mac-langpacks.zip @@ -207,16 +196,12 @@ script: | for LANG in $BUNDLE_LOCALES do xpi=$LANG.xpi - if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - DEST=${TORBROWSER_APP}_$LANG - else - DEST=$TORBROWSER_APP - fi + DEST=$TORBROWSER_APP cp -a ../${TORBROWSER_NAME}_plain.app ~/build/dmg/$DEST.app cp $xpi ~/build/dmg/$DEST.app/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - pushd ~/build/dmg/$DEST.app/Contents/MacOS/browser/ + pushd ~/build/dmg/$DEST.app/Contents/Resources/browser/ mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. @@ -225,28 +210,19 @@ 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/ + # Set the update.locale (it is used to replace %LOCALE% within + # app.update.url) and recreate the precomplete file (needs to be accurate + # for full MAR updates). + pushd ~/build/dmg/$DEST.app/Contents/Resources/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale + rm -f precomplete + python $MARTOOLS/createprecomplete.py 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 - rm -rf TorBrowserBundle_$LANG.app - popd - else - # Recreate precomplete file (needs to be accurate for full MAR updates). - pushd ~/build/dmg/$DEST.app/ - rm -f precomplete - python $MARTOOLS/createprecomplete.py - popd - # - MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app - ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ - rm -rf ~/build/dmg/$DEST.app - fi + # + MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ + rm -rf ~/build/dmg/$DEST.app cd mac-langpacks done diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e7a4dcb..e8f1046 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -16,11 +16,13 @@ remotes: - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" files: -- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "gcc-linux64-precise-utils.zip" +- "MacOSX10.7.sdk.tar.gz" - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" - "fix-info-plist.py" +- "libfaketime.patch" - "versions" script: | INSTDIR="$HOME/install/" @@ -34,25 +36,26 @@ script: | # Building libfaketime. cd faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch 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 - # better solution. See: comment 15 in - # https://bugzilla.mozilla.org/show_bug.cgi?id=936115 - export PATH=$PATH:/home/ubuntu/build/x-tools/x86_64-apple-darwin10/bin - # FIXME: path hacks: - sudo mkdir -p /System/Library/ - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/ /System/Library/ - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/PrivateFrameworks/ /System/Library/ - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/libstdc++.6.dylib /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/libstdc++.dylib + unzip -d $INSTDIR ~/build/gcc-linux64-precise-utils.zip + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + ln -s gcc $INSTDIR/gcc/bin/cc + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 + # XXX: cross-compiler path is needed for ICU + export PATH=/home/ubuntu/build/x-tools/x86_64-apple-darwin10/bin:$INSTDIR/gcc/bin:$PATH + + tar xaf x86_64-apple-darwin10.tar.xz + tar xaf MacOSX10.7.sdk.tar.gz # cd tor-browser mv .mozconfig-mac .mozconfig @@ -72,11 +75,10 @@ script: | # 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. + # reliably with the new libfaketime and |python2.7| as well as the build would + # stall otherwise right at the beginning. See #13877 for details. 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" + export FAKETIME_SKIP_CMDS="python2.7,rsync,make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true @@ -101,11 +103,9 @@ script: | mv $INFO_PLIST tmp.plist ~/build/fix-info-plist.py $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST rm -f tmp.plist - ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja - ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/webapprt/omni.ja - if [ -f TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then # FF24 includes a third .ja - ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/browser/omni.ja - fi + ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja + ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja + ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/browser/omni.ja cd TorBrowser.app/ ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents cp tor-browser-mac${GBUILD_BITS}-gbuilt.zip $OUTDIR diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 6d93817..c47767e 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -4,11 +4,14 @@ suites: - "precise" architectures: - "i386" +- "amd64" packages: - "faketime" - "automake" - "libtool" - "zip" +# Needed for compiling GCC. +- "libmpc-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -16,6 +19,7 @@ remotes: files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" +- "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" - "versions" @@ -23,61 +27,76 @@ 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 - sudo dpkg -i *.deb - tar xaf multiarch-darwin*tar.xz - export PATH="$PATH:$HOME/build/apple-osx/bin/" - # For OpenSSL - ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc - #For gmp, need to trick it so it knows we're doing a 64 bit build - for i in ~/build/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; + if [ $GBUILD_BITS == "64" ]; + then + # Building GCC. We need this as Firefox ESR 38 has GCC 4.7 as minimum + # requirement for the host compiler but Ubuntu Precise is only shipping 4.6. + tar xaf gcc.tar.bz2 + cd gcc-* + ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + make $MAKEOPTS + make install + cd $INSTDIR + ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc + cp *utils.zip $OUTDIR/ + else + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME - # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + sudo dpkg -i *.deb + tar xaf multiarch-darwin*tar.xz + export PATH="$PATH:$HOME/build/apple-osx/bin/" + # For OpenSSL + ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc + #For gmp, need to trick it so it knows we're doing a 64 bit build + for i in ~/build/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - # Building Libevent - cd libevent - ./autogen.sh - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent - make $MAKEOPTS - make install - cd .. + # XXX Clean up these flags? + export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - # Building OpenSSL - tar xzf openssl.tar.gz - cd openssl-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. - ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 - # Using $MAKEOPTS breaks the build. Might be the issue mentioned on - # http://cblfs.cross-lfs.org/index.php/OpenSSL. - make - make install - cd .. + # Building Libevent + cd libevent + ./autogen.sh + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + make $MAKEOPTS + make install + cd .. - # Building GMP - tar xjf gmp.tar.bz2 - cd gmp-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # Even if we are not shipping libgmpxx anymore we still need --enable-xcc - # during compile time. - ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - make - make install - cd .. + # Building OpenSSL + tar xzf openssl.tar.gz + cd openssl-* + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. + ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 + # Using $MAKEOPTS breaks the build. Might be the issue mentioned on + # http://cblfs.cross-lfs.org/index.php/OpenSSL. + make + make install + cd .. - # Grabbing the results - cd $INSTDIR - ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl - ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent - ~/build/dzip.sh gmp-$GMP_VER-mac64-utils.zip gmp + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + # Even if we are not shipping libgmpxx anymore we still need --enable-xcc + # during compile time. + ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cd .. - cp *utils.zip $OUTDIR/ + # Grabbing the results + cd $INSTDIR + ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl + ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent + ~/build/dzip.sh gmp-$GMP_VER-mac64-utils.zip gmp + + cp *utils.zip $OUTDIR/ + fi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 63460e8..2a5bd16 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,7 +132,7 @@ do fi done -for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK MSVCR100 +for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -166,8 +166,8 @@ done wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index ea547e9..363ebb1 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -106,7 +106,8 @@ fi cd $GITIAN_DIR -if [ ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ +if [ ! -f inputs/gcc-$GCC_VER-linux64-precise-utils.zip -o \ + ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-mac64-utils.zip ]; then @@ -122,6 +123,7 @@ then cd inputs cp -a ../build/out/*-utils.zip . + ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip @@ -135,6 +137,7 @@ else # We might have built the utilities in the past but maybe the links are # pointing to the wrong version. Refresh them. cd inputs + ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip diff --git a/gitian/patches/libfaketime.patch b/gitian/patches/libfaketime.patch new file mode 100644 index 0000000..d170eda --- /dev/null +++ b/gitian/patches/libfaketime.patch @@ -0,0 +1,54 @@ +From 3ea3df1129a9918dea7efdf3a529227f16b237aa Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 21 May 2015 07:32:16 +0000 +Subject: [PATCH] Allow more than one command being skipped + +--- + src/libfaketime.c | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/libfaketime.c b/src/libfaketime.c +index ecda143..ad45857 100644 +--- a/src/libfaketime.c ++++ b/src/libfaketime.c +@@ -1455,17 +1455,29 @@ void __attribute__ ((constructor)) ftpl_init(void) + /* We can prevent faking time for specified commands */ + if ((tmp_env = getenv("FAKETIME_SKIP_CMDS")) != NULL) + { +- char *skip_cmd, *saveptr; +- skip_cmd = strtok_r(tmp_env, ",", &saveptr); +- while (skip_cmd != NULL) ++ char *skip_cmd, *saveptr, *tmpvar; ++ /* Don't mess with the env variable directly. */ ++ tmpvar = strdup(tmp_env); ++ if (tmpvar != NULL) + { +- if (0 == strcmp(progname, skip_cmd)) ++ skip_cmd = strtok_r(tmpvar, ",", &saveptr); ++ while (skip_cmd != NULL) + { +- ft_mode = FT_NOOP; +- dont_fake = true; +- break; ++ if (0 == strcmp(progname, skip_cmd)) ++ { ++ ft_mode = FT_NOOP; ++ dont_fake = true; ++ break; ++ } ++ skip_cmd = strtok_r(NULL, ",", &saveptr); + } +- skip_cmd = strtok_r(NULL, ",", &saveptr); ++ free(tmpvar); ++ tmpvar = NULL; ++ } ++ else ++ { ++ fprintf(stderr, "Error: Could not copy the environment variable value.\n"); ++ exit(EXIT_FAILURE); + } + } + +-- +2.1.4 + diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 5c1d552..2c4e8c6 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,8 +140,8 @@ do done # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 4a612c1..dc8b095 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,7 +60,8 @@ GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 -OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz +OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -81,7 +82,8 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf +OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c4b04cc..229e46d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -60,7 +60,8 @@ GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 -OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz +OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -81,7 +82,8 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf +OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e diff --git a/gitian/versions.nightly b/gitian/versions.nightly index cef40eb..27a2e27 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -63,7 +63,8 @@ GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 -OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz +OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -84,7 +85,8 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf +OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e

1 0

[tor-browser-bundle/master] Merge branch 'bug_16210'
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit 6807f337314448d287a10d92516817fbae1cf5f4 Merge: d0bc63e ccb9a00 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 09:39:12 2015 +0000 Merge branch 'bug_16210' gitian/descriptors/linux/gitian-firefox.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[tor-browser-bundle/master] Bug 16210: Fix paths and stripping for ESR 38
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit ccb9a005e959b9812b654a9fd0c9d4937e051030 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 17 09:04:34 2015 +0000 Bug 16210: Fix paths and stripping for ESR 38 In addition to fixing broken paths and stripping Linux binaries we exempt |python 2.7| from libfaketime due to #13877, too. --- gitian/descriptors/linux/gitian-firefox.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index e7c8bfa..05b2beb 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -38,7 +38,6 @@ files: script: | source versions INSTDIR="$HOME/install" - export LIBRARY_PATH="$INSTDIR/lib" export CFLAGS="-frandom-seed=tor" export CXXFLAGS="-frandom-seed=tor" export TZ=UTC @@ -91,6 +90,7 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $INSTDIR/Debug/Browser/components + mkdir -p $INSTDIR/Debug/Browser/browser/components # Building libfaketime cd faketime @@ -115,9 +115,10 @@ script: | # 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. + # comment 13. Finally, we need to exclude |python2.7| as not doing so would + # stall the build right at the beginning. See #13877. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME_SKIP_CMDS="bash,make" + export FAKETIME_SKIP_CMDS="python2.7,bash,make" find -type f -print0 | xargs -0 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 @@ -158,9 +159,9 @@ script: | cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ # # Strip and generate debuginfo for the firefox binary that we keep, all *.so - # files, and the plugin-container (see ticket #10126) + # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/mozilla-xremote-client Browser/firefox Browser/plugin-container Browser/components/*.so # Browser/updater + for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/components/*.so Browser/browser/components/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser-bundle/master] Bug 15990: Gitian changes for ESR 38 on Windows
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit d0bc63e7d7a1149c8faf336190d7a771eb46c234 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 28 09:23:00 2015 +0000 Bug 15990: Gitian changes for ESR 38 on Windows --- gitian/descriptors/windows/gitian-firefox.yml | 25 ++++++++++++------------- gitian/descriptors/windows/gitian-utils.yml | 10 ++++++++++ gitian/mkbundle-windows.sh | 3 +++ gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index ab8d7c6..c7efb62 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -4,8 +4,8 @@ suites: architectures: - "i386" packages: -- "autoconf2.13" - "unzip" +- "autoconf2.13" - "yasm" - "zip" reference_datetime: "2000-01-01 00:00:00" @@ -15,6 +15,7 @@ remotes: - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" files: +- "gcc-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" - "re-dzip.sh" - "dzip.sh" @@ -33,10 +34,15 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $OUTDIR/ + unzip -d $INSTDIR gcc-linux32-precise-utils.zip + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + ln -s gcc $INSTDIR/gcc/bin/cc unzip -d $INSTDIR mingw-w64-win32-utils.zip unzip -d $INSTDIR gcclibs-win32-utils.zip - # Make sure our custom mingw gets used. - export PATH=$INSTDIR/mingw-w64/bin:$PATH + # Make sure our custom mingw and GCC (as host compiler) get used. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib + export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$PATH # Building libfaketime cd faketime @@ -90,23 +96,16 @@ script: | # 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. + # Additionally, we need to exclude |python2.7| as well as the build would + # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME_SKIP_CMDS="make" + export FAKETIME_SKIP_CMDS="python2.7,make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ cp -a ~/build/msvcr100.dll $INSTDIR/Browser/ cp -a $INSTDIR/gcclibs/libssp-0.dll $INSTDIR/Browser/ - # - # What the hell are these three bytes anyways? - # FIXME: This was probably fixed by patching binutils. If we get matching - # builds without it, remove these two: - #sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/xul.dll - #sed 's/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8...\x04\xba\xcb\x7e/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/gkmedias.dll - # Stripping again updates the PE header checksums to be correct - i686-w64-mingw32-strip $INSTDIR/Browser/gkmedias.dll - i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll # Make MAR-based update tools available for use during the bundle phase. MARTOOLS=~/build/mar-tools diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 2b978e3..6e52c67 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -38,6 +38,15 @@ script: | export LC_ALL=C umask 0022 + # Building GCC to use it as the host compiler. Firefox 38 needs GCC >= 4.7 but + # Ubuntu Precise is only shipping with GCC 4.6.x. + tar xjf gcc.tar.bz2 + cd gcc-* + ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + make $MAKEOPTS + make install + cd .. + # Building binutils tar xjf binutils.tar.bz2 cd binutils* @@ -157,6 +166,7 @@ script: | cd $INSTDIR # We might want to bump binutils independent of bumping mingw-w64. touch binutils-$BINUTILS_VER-win32-utils.zip + ~/build/dzip.sh gcc-$GCC_VER-linux32-precise-utils.zip gcc ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 4de847b..238ad51 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -102,6 +102,7 @@ cd $GITIAN_DIR if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/gcclibs-$GCC_VER-win32-utils.zip -o \ + ! -f inputs/gcc-$GCC_VER-linux32-precise-utils.zip -o \ ! -f inputs/mingw-w64-$GCC_VER-win32-utils.zip -o \ ! -f inputs/zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ @@ -127,6 +128,7 @@ then ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip + ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -142,6 +144,7 @@ else ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip + ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip cd .. fi diff --git a/gitian/versions b/gitian/versions index a073427..4a612c1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? +MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 56b46b9..c4b04cc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? +MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index bea7547..cef40eb 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -19,7 +19,7 @@ HTTPSE_TAG=master NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? +MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master

1 0

[tor-browser-bundle/master] Bug 16011: Add a script to check authenticode sigs
by gk＠torproject.org 18 Jun '15

18 Jun '15

commit fa0f65f3f2b9be47c82dc931e0648b9dddfa8c05 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 8 13:29:49 2015 +0000 Bug 16011: Add a script to check authenticode sigs --- tools/authenticode_check.sh | 95 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/tools/authenticode_check.sh b/tools/authenticode_check.sh new file mode 100755 index 0000000..86472ae --- /dev/null +++ b/tools/authenticode_check.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +# Copyright (c) 2015, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: + +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Usage: +# 1) Let OSSLSIGNCODE point to your osslsigncode binary +# 2) Change into the directory containing the .exe files and the sha256sums.txt +# 3) Run /path/to/authenticode_check.sh + +if [ -z "$OSSLSIGNCODE" ] +then + echo "The path to your osslsigncode binary is missing!" + exit 1 +fi + +UNSIGNED_BUNDLES=0 +BADSIGNED_BUNDLES=0 + +mkdir tmp + +for f in `ls *.exe`; do + SHA256_TXT=`grep "$f" sha256sums.txt` + + # Test 1: Is the .exe file still unsigned? I.e. does its SHA 256 sum still + # match the one we had before we signed the .exe file? If so, notify us + # later and exit. + if [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f has still the SHA 256 sum of the unsigned bundle!" + UNSIGNED_BUNDLES=`expr $UNSIGNED_BUNDLES + 1` + fi + + # Test 2: Do we get the old SHA 256 sum after stripping the authenticode + # signature? If not, notify us later and exit. + if [ "$UNSIGNED_BUNDLES" = "0" ] + then + # At least we seem to have attempted to sign the bundle. Let's see if we + # succeeded by stripping the signature. This behavior is reproducible. + # Thus, we know if we don't get the same SHA 256 sum we did not sign the + # bundle correctly. + echo "Trying to strip the authenticode signature of $f..." + ${OSSLSIGNCODE} remove-signature $f tmp/$f + cd tmp + if ! [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + BADSIGNED_BUNDLES=`expr $BADSIGNED_BUNDLES + 1` + fi + cd .. + fi +done + +rm -rf tmp/ + +if ! [ "$UNSIGNED_BUNDLES" = "0" ] +then + echo "We got $UNSIGNED_BUNDLES unsigned bundle(s), exiting..." + exit 1 +fi + +if ! [ "$BADSIGNED_BUNDLES" = "0" ] +then + echo "We got $BADSIGNED_BUNDLES badly signed bundle(s), exiting..." + exit 1 +fi + +echo "The signatures are fine." +exit 0

1 0

[tor-browser-bundle/master] Merge branch 'bug_16011'
by gk＠torproject.org 18 Jun '15

18 Jun '15

commit c15148af3030d08c550d6b25261714e7f26d0f3d Merge: f35744d fa0f65f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 18 08:02:54 2015 +0000 Merge branch 'bug_16011' tools/authenticode_check.sh | 95 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)

1 0

[tor-browser-bundle/master] Bug 16283: Bump VM_MEMORY to 4000 by default
by gk＠torproject.org 17 Jun '15

17 Jun '15

commit 8b3ad7a6dd53a263a1bee8c9ddf0d304e59d856f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 3 13:50:07 2015 +0000 Bug 16283: Bump VM_MEMORY to 4000 by default Firefox is not happy with 2000 MiB RAM which is the current default. The build crashes randomly in this case. --- gitian/README.build | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 8d8f008..4b211a0 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -35,10 +35,10 @@ QuickStart: $ export NUM_PROCS=4 - To set the amount of RAM to use inside the VMs to 4000 MiB (the default is - 2000 MiB), use: + To set the amount of RAM to use inside the VMs to 8000 MiB (the default is + 4000 MiB), use: - $ export VM_MEMORY=4000 + $ export VM_MEMORY=8000 Detailed Explanation of Scripts: diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 15e1384..cb80214 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 01a9d1b..ea547e9 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e7bdc87..4de847b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh

1 0

[tor-browser-bundle/master] Merge branch 'bug_16283'
by gk＠torproject.org 17 Jun '15

17 Jun '15

commit f35744d076aa2aeceeb5fd64faf1945b58ba435e Merge: f0f7fdb 8b3ad7a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 17 13:43:47 2015 +0000 Merge branch 'bug_16283' gitian/README.build | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor-browser-bundle/master] Bump nightly versions (Firefox/NoScript)
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit f0f7fdbdad8a6ac9fdfea1c00a84deefb816b7df Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:46:00 2015 +0000 Bump nightly versions (Firefox/NoScript) --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 73a5fe7..bea7547 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.6.0esr +FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -60,7 +60,7 @@ GO_VER=1.4.2 ## 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.9.21-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -87,7 +87,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c +NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 16388: Bump OpenSSL to 1.0.1o
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit c779ab8b929c2d800a2e85d36a7f9e8d118eac16 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:37:40 2015 +0000 Bug 16388: Bump OpenSSL to 1.0.1o --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions b/gitian/versions index e1bf555..a073427 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d34f0af..56b46b9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5a8eb91..73a5fe7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -82,7 +82,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-4.5] Bug 16388: Bump OpenSSL to 1.0.1o
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit 64e129c8755a3cd0e0392cdbd149137ce41e32e1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:32:08 2015 +0000 Bug 16388: Bump OpenSSL to 1.0.1o --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index e1bf555..a073427 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Bug 16150: Take care of whitespace in filenames
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit e35d7c08cc2d9dbbe9c963573858dc49eb5ba563 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 21 13:15:49 2015 +0000 Bug 16150: Take care of whitespace in filenames It turned out that setting the timestamp to 2000-01-01 00:00:00 is breaking with Firefox 38 ESR as we have files with whitespaces there for the first time. The conversion was done with the following Perl snippet: perl -p -i -e 's/find -type f \| xargs/find -type f -print0 \| xargs -0/g' \ `find ./ -name *.yml` --- gitian/descriptors/linux/gitian-firefox.yml | 4 +- .../linux/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/linux/gitian-utils.yml | 6 +-- gitian/descriptors/mac/gitian-firefox.yml | 4 +- .../mac/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-utils.yml | 6 +-- gitian/descriptors/windows/gitian-firefox.yml | 4 +- .../windows/gitian-pluggable-transports.yml | 42 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 ++--- 12 files changed, 81 insertions(+), 81 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3a144ca..e7c8bfa 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -103,7 +103,7 @@ script: | 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" + find -type f -print0 | xargs -0 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 @@ -118,7 +118,7 @@ script: | # 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" + find -type f -print0 | xargs -0 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. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 1130cdf..0f123ff 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -90,7 +90,7 @@ script: | # Building pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. @@ -98,7 +98,7 @@ script: | # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. @@ -106,7 +106,7 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. @@ -114,7 +114,7 @@ script: | # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. @@ -122,7 +122,7 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. @@ -130,7 +130,7 @@ script: | # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. @@ -138,7 +138,7 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/parsley.py $PTDIR/ cp -a build/ometa $PTDIR/ @@ -147,7 +147,7 @@ script: | # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -159,7 +159,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin @@ -170,7 +170,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl $PYTHON setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ @@ -178,7 +178,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy @@ -188,7 +188,7 @@ script: | # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make cp -ra fte $PTDIR/ mkdir -p $INSTDIR/Docs/libfte @@ -198,7 +198,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy @@ -207,7 +207,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -215,7 +215,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client go build -ldflags '-s' cp -a meek-client $PTDIR @@ -230,7 +230,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -238,7 +238,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -246,7 +246,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -256,7 +256,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -264,7 +264,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index b218486..617e8df 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -87,7 +87,7 @@ script: | mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR make $MAKEOPTS make install diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0646401..740a22c 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -79,7 +79,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -88,7 +88,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 @@ -125,7 +125,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. # --enable-fat makes the binaries slightly bigger but fixes reproducibility diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index f609268..e7a4dcb 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -59,7 +59,7 @@ script: | # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 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 @@ -67,7 +67,7 @@ script: | # 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" + find -type f -print0 | xargs -0 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. diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 30f6444..d483462 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -105,7 +105,7 @@ script: | # Building pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. @@ -113,7 +113,7 @@ script: | # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # https://bugs.launchpad.net/pycrypto/+bug/1096207 for ac_cv_func_malloc_0_nonnull. ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-apple-darwin11 LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers @@ -124,7 +124,7 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. @@ -132,7 +132,7 @@ script: | # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. @@ -140,7 +140,7 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. @@ -148,7 +148,7 @@ script: | # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers python setup.py build --build-lib build cp -a build/twisted $PTDIR/ @@ -157,7 +157,7 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/parsley.py $PTDIR/ cp -a build/ometa $PTDIR/ @@ -166,7 +166,7 @@ script: | # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -178,7 +178,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin @@ -191,7 +191,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # We have to put $INSTDIR/openssl at the beginning of the header and library # search paths (build_ext otherwise puts it at the end, after CFLAGS and # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr @@ -205,7 +205,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $TBDIR/Docs/FlashProxy @@ -214,7 +214,7 @@ script: | # Building libfte cd libfte - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make cp -ra fte $PTDIR/ mkdir -p $TBDIR/Docs/libfte @@ -224,7 +224,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ mkdir -p $TBDIR/Docs/fteproxy @@ -233,7 +233,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -241,7 +241,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client # https://code.google.com/p/go/issues/detail?id=4714#c7 # We need cgo for crypto/x509 support on mac. @@ -258,7 +258,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -266,7 +266,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -274,7 +274,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -284,7 +284,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -292,7 +292,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 3d0e0c6..b3e4425 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -65,7 +65,7 @@ script: | mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --enable-static-openssl --disable-asciidoc --host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR make $MAKEOPTS make install diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 6729eeb..6d93817 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -45,7 +45,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -54,7 +54,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 # Using $MAKEOPTS breaks the build. Might be the issue mentioned on @@ -66,7 +66,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index c5f2c41..ab8d7c6 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -73,7 +73,7 @@ script: | # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 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 @@ -81,7 +81,7 @@ script: | # 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" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/ cp ~/build/i686* ~/build/bin/ diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 339a63e..1d8caba 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -163,20 +163,20 @@ script: | # Building setuptools tar xzf setuptools.tar.gz cd setuptools-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Bulding pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # This is bogus, that we run the configure script in the build environment, # but it seems to work. https://bugs.launchpad.net/pycrypto/+bug/1096207 for # ac_cv_func_malloc_0_nonnull. @@ -188,14 +188,14 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null # Must create this file in order for py2exe to find the package. @@ -205,14 +205,14 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" # rather than "Python.h". ln -sf Python.h $INSTDIR/python/include/python.h @@ -231,13 +231,13 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -251,7 +251,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe LD_PRELOAD= $INSTPYTHON setup.py install py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip @@ -263,7 +263,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. @@ -273,7 +273,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ @@ -285,7 +285,7 @@ script: | cd libfte ln -s $INSTDIR/gmp thirdparty/gmp cp -a $INSTDIR/gmp/bin/libgmp-10.dll . - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= WINDOWS_BUILD=1 CROSS_COMPILE=1 PYTHON=$INSTPYTHON make LD_PRELOAD= $INSTPYTHON setup.py install mkdir -p $INSTDIR/Docs/libfte @@ -295,7 +295,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ @@ -309,7 +309,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -317,7 +317,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client go build -ldflags '-s' cp -a meek-client.exe $PTDIR @@ -336,7 +336,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -344,7 +344,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -352,7 +352,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -362,7 +362,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -370,7 +370,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 87e1dc2..edcc091 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -68,7 +68,7 @@ script: | export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ make $MAKEOPTS make install diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index bef262d..2b978e3 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -97,7 +97,7 @@ script: | cd .. # Second stage of gcc compilation cd gcc - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS make install mkdir -p $INSTDIR/gcclibs @@ -116,7 +116,7 @@ script: | export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" cd zlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" install cd .. @@ -124,7 +124,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-w64-mingw32 --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -133,7 +133,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl # Using $MAKEOPTS breaks the build. Might be the issue mentioned on @@ -145,7 +145,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared

1 0

[tor-browser-bundle/master] Merge branch 'bug_16150_v2'
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit f1783ba6746b9facbd35273d665cd48a36eb9c2f Merge: c57e340 e35d7c0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 11:53:17 2015 +0000 Merge branch 'bug_16150_v2' gitian/descriptors/linux/gitian-firefox.yml | 4 +- .../linux/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/linux/gitian-utils.yml | 6 +-- gitian/descriptors/mac/gitian-firefox.yml | 4 +- .../mac/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-utils.yml | 6 +-- gitian/descriptors/windows/gitian-firefox.yml | 4 +- .../windows/gitian-pluggable-transports.yml | 42 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 ++--- 12 files changed, 81 insertions(+), 81 deletions(-)

1 0

[tor-browser-bundle/master] Bug 14387: Make MAR signing process more verbose
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit c57e340382377ccc1f0e376b23b621a1d7eef1d6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 15 13:19:20 2015 +0000 Bug 14387: Make MAR signing process more verbose --- gitian/signmars.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/signmars.sh b/gitian/signmars.sh index ed42971..ea315ea 100755 --- a/gitian/signmars.sh +++ b/gitian/signmars.sh @@ -121,6 +121,7 @@ done TMPMAR="$SIGNED_DIR/tmp.mar" trap "rm -f $TMPMAR" EXIT cd "$UNSIGNED_DIR" +echo "Starting the signing..." COUNT=0 for marfile in *.mar; do if [ ! -f "$marfile" ]; then @@ -130,6 +131,7 @@ for marfile in *.mar; do "$marfile" "$TMPMAR" mv "$TMPMAR" "$SIGNED_DIR/$marfile" COUNT=$((COUNT + 1)) + echo "Signed MAR file $COUNT" done echo "The $COUNT MAR files located in $SIGNED_DIR/ have been signed."

1 0

[tor-browser-bundle/master] Bump release dates to June 15th.
by mikeperry＠torproject.org 11 Jun '15

11 Jun '15

commit 2ae79282688ccd01284fd4bddecc4ff72663c9d2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 11 13:34:49 2015 -0700 Bump release dates to June 15th. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index de9fb59..e986e5c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 5.0a2 -- June 12 2015 +Tor Browser 5.0a2 -- June 15 2015 * All Platforms * Update Tor to 0.2.7.1-alpha * Update HTTPS-Everywhere to 5.0.5 @@ -18,7 +18,7 @@ Tor Browser 5.0a2 -- June 12 2015 * Bug 16026: Fix crash in GStreamer * Bug 16083: Update comment in start-tor-browser -Tor Browser 4.5.2 -- June 12 2015 +Tor Browser 4.5.2 -- June 15 2015 * All Platforms * Update Tor to 0.2.6.9 * Update HTTPS-Everywhere to 5.0.5

1 0

[tor-browser-bundle/master] Update versions and changelog for OpenSSL 1.0.1n.
by mikeperry＠torproject.org 11 Jun '15

11 Jun '15

commit c110b4fa7b8be0d6c511698f4c6668901e235c14 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 11 13:14:12 2015 -0700 Update versions and changelog for OpenSSL 1.0.1n. Also bump Tor to 0.2.6.9. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index df35913..de9fb59 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 5.0a2 -- June 12 2015 * All Platforms * Update Tor to 0.2.7.1-alpha * Update HTTPS-Everywhere to 5.0.5 + * Update OpenSSL to 1.0.1n * Update NoScript to 2.6.9.26 * Update meek to 0.19 * Update Torbutton to 1.9.2.7 @@ -19,8 +20,9 @@ Tor Browser 5.0a2 -- June 12 2015 Tor Browser 4.5.2 -- June 12 2015 * All Platforms - * Update Tor to 0.2.6.8 + * Update Tor to 0.2.6.9 * Update HTTPS-Everywhere to 5.0.5 + * Update OpenSSL to 1.0.1n * Update NoScript to 2.6.9.26 * Update Torbutton to 1.9.2.6 * Bug 15984: Disabling Torbutton breaks the Add-ons Manager diff --git a/gitian/versions b/gitian/versions index 9c0aac1..e1bf555 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1 -TOR_TAG=tor-0.2.6.8 +TOR_TAG=tor-0.2.6.9 TORLAUNCHER_TAG=0.2.7.5 TORBUTTON_TAG=1.9.2.6 HTTPSE_TAG=5.0.5 @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1n GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2b2f6cd..d34f0af 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1n GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-launcher/master] Bump version to 0.2.7.6.
by brade＠torproject.org 10 Jun '15

10 Jun '15

commit d35ac816112de384e8e21c1c390e4bc5c1468b7e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 10 10:28:33 2015 -0400 Bump version to 0.2.7.6. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b2ca19c..2e9babc 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.4</em:version> + <em:version>0.2.7.6</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-launcher/master] Bug 15145: Visually distinguish "proxy" and "bridge" screens.
by brade＠torproject.org 10 Jun '15

10 Jun '15

commit c12448c935c9af9725664c27fd5a2fd4b45e5688 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu May 21 15:10:51 2015 -0400 Bug 15145: Visually distinguish "proxy" and "bridge" screens. Add the following titles to the bridge and proxy wizard pages: "Tor Bridges Configuration" "Local Proxy Configuration" --- src/chrome/content/network-settings-wizard.xul | 56 +++++++++++++++++------- src/chrome/locale/en/network-settings.dtd | 2 + src/chrome/skin/network-settings.css | 5 +++ 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 9c75894..00c1682 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -57,10 +57,16 @@ <wizardpage pageid="bridges" next="proxy" onextra2="onCopyLog();" onpageshow="showWizardNavButtons(true);" onpageadvanced="return onWizardUseBridgesNext(this)"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/> + </vbox> + </hbox> + <separator /> <hbox> <vbox flex="1"> <label class="question">&torSettings.bridgeQuestion;</label> @@ -76,10 +82,16 @@ <wizardpage pageid="bridgeSettings" next="proxy" onextra2="onCopyLog();" onpageshow="onWizardBridgeSettingsShow();"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/> + </vbox> + </hbox> + <separator /> <vbox> <label id="bridgeSettingsPrompt" class="question">&torSettings.bridgeSettingsPrompt;</label> @@ -90,10 +102,16 @@ <wizardpage pageid="proxy" onextra2="onCopyLog();" onpageshow="onWizardUseProxyRadioChange()" onpageadvanced="return onWizardProxyNext(this);"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/> + </vbox> + </hbox> + <separator /> <hbox> <vbox flex="1"> <label class="question">&torSettings.proxyQuestion;</label> @@ -111,10 +129,16 @@ <wizardpage pageid="proxyYES" onextra2="onCopyLog();" onpageshow="onWizardProxySettingsShow()" onpageadvanced="return (getAndValidateProxySettings() != null)"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/> + </vbox> + </hbox> + <separator /> <label class="instructions">&torSettings.enterProxy;</label> <groupbox id="proxySpecificSettings" /> </wizardpage> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 5ce6ee8..07d3d09 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -15,10 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 646baa6..6e173c3 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -99,6 +99,11 @@ wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { display: none; } +.tbb-wizardpage-title { + font-size: 115%; + font-weight: bold; +} + #bridgeDefaultEntry, #bridgeCustomEntry { margin-left: 1.8em;

1 0

[tor-browser-bundle/master] Preparations for 5.0a2
by gk＠torproject.org 05 Jun '15

05 Jun '15

commit 52317483ec963ff628ae35d27778042dbca0591a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 5 10:17:52 2015 +0000 Preparations for 5.0a2 --- Bundle-Data/Docs/ChangeLog.txt | 19 +++++++++++++++++++ gitian/versions.alpha | 14 +++++++------- tools/update-responses/config.yml | 9 ++++----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 14522bc..df35913 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,22 @@ +Tor Browser 5.0a2 -- June 12 2015 + * All Platforms + * Update Tor to 0.2.7.1-alpha + * Update HTTPS-Everywhere to 5.0.5 + * Update NoScript to 2.6.9.26 + * Update meek to 0.19 + * Update Torbutton to 1.9.2.7 + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Bug 14429: Make sure the automatic resizing is enabled + * Translation updates + * Bug 16130: Defend against logjam attack + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Windows + * Bug 16014: Staged update fails if meek is enabled + * Bug 16269: repeated add-on compatibility check after update (meek enabled) + * Linux + * Bug 16026: Fix crash in GStreamer + * Bug 16083: Update comment in start-tor-browser + Tor Browser 4.5.2 -- June 12 2015 * All Platforms * Update Tor to 0.2.6.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d2ff1e3..2b2f6cd 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 -TOR_TAG=tor-0.2.6.7 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1 +TOR_TAG=tor-0.2.7.1-alpha TORLAUNCHER_TAG=0.2.7.5 -TORBUTTON_TAG=1.9.2.5 -HTTPSE_TAG=5.0.3 +TORBUTTON_TAG=1.9.2.7 +HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.18 +MEEK_TAG=0.19 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd @@ -57,7 +57,7 @@ GO_VER=1.4.2 ## 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.9.22-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -84,7 +84,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 +NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 90524bd..fd9bd23 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.0a1 + alpha: 5.0a2 release: 4.5.2 versions: 4.5.2: @@ -23,13 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.0a1: + 5.0a2: platformVersion: 31.7.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0a1 + download_url: https://www.torproject.org/dist/torbrowser/5.0a2 incremental_from: - - 4.5 - - 4.5a5 + - 5.0a1 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Bump version to 1.9.2.7
by gk＠torproject.org 05 Jun '15

05 Jun '15

commit 1b7833eaea2adbf100880cd50c6a81b1d47c28e6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 5 09:52:22 2015 +0000 Bump version to 1.9.2.7 --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a46336a..7abf527 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.7 + * Bug 14429: Make sure the automatic resizing is enabled + 1.9.2.6 * Bug 15984: Disabling Torbutton breaks the Add-ons Manager * Bug 14429: Make sure the automatic resizing is disabled diff --git a/src/install.rdf b/src/install.rdf index 8379338..ae087f7 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.9.2.6</em:version> + <em:version>1.9.2.7</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

[torbutton/master] Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning.""
by gk＠torproject.org 05 Jun '15

05 Jun '15

commit edeaca158e86d1be1bea5bbb92cc6a3c9f481c23 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 5 06:47:31 2015 +0000 Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning."" This reverts commit f35b2f858359289d1c47967d34ca03bd678397c8. --- src/defaults/preferences/preferences.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 68c4f60..4d1dee0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -118,7 +118,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 3); +pref("extensions.torbutton.maximize_warnings_remaining", 0); pref("extensions.torbutton.startup_resize_period", true); // Security prefs: @@ -159,7 +159,7 @@ pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.resize_windows",false); +pref("extensions.torbutton.resize_windows",true); pref("extensions.torbutton.banned_ports","9050,9051,9150,9151"); pref("extensions.torbutton.block_tor_file_net",true); pref("extensions.torbutton.block_nontor_file_net",false);

1 0

[tor-browser-bundle/master] Remove superfluous newline
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit 011515d18daa27b7163f8f595f1ec30c39ea2989 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 13:38:31 2015 +0000 Remove superfluous newline --- gitian/versions | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 74cf17c..9c0aac1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -61,7 +61,6 @@ NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb - MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2

1 0

[tor-browser-bundle/master] Preparations for 4.5.2
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit fa3c0784ed6feee6bb6a44a7ef17f3feeb57b7ee Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 13:28:16 2015 +0000 Preparations for 4.5.2 --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ gitian/versions | 13 +++++++------ tools/update-responses/config.yml | 9 ++++----- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7ff3900..14522bc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,18 @@ +Tor Browser 4.5.2 -- June 12 2015 + * All Platforms + * Update Tor to 0.2.6.8 + * Update HTTPS-Everywhere to 5.0.5 + * Update NoScript to 2.6.9.26 + * Update Torbutton to 1.9.2.6 + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + * Bug 16130: Defend against logjam attack + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Linux + * Bug 16026: Fix crash in GStreamer + * Bug 16083: Update comment in start-tor-browser + Tor Browser 5.0a1 -- May 14 2015 * All Platforms * Update Firefox to 31.7.0esr diff --git a/gitian/versions b/gitian/versions index 3ec62bc..74cf17c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.7 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1 +TOR_TAG=tor-0.2.6.8 TORLAUNCHER_TAG=0.2.7.5 -TORBUTTON_TAG=1.9.2.3 -HTTPSE_TAG=5.0.3 +TORBUTTON_TAG=1.9.2.6 +HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -57,10 +57,11 @@ GO_VER=1.4.2 ## 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.9.22-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb + MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -84,7 +85,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 +NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d8ec1ee..90524bd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.0a1 - release: 4.5.1 + release: 4.5.2 versions: - 4.5.1: + 4.5.2: platformVersion: 31.7.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5.1 + download_url: https://www.torproject.org/dist/torbrowser/4.5.2 incremental_from: - - 4.5 - - 4.0.8 + - 4.5.1 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Preparations for 1.9.2.6
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit 2d06b26e60ee0bf2b21b5c2e8658c2786dd16b16 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 12:05:53 2015 +0000 Preparations for 1.9.2.6 Version bump, CHANGELOG update and translations update. --- src/CHANGELOG | 5 ++ src/chrome/locale/de/aboutTor.dtd | 2 +- src/chrome/locale/de/torbutton.properties | 2 +- src/chrome/locale/en/brand.dtd | 1 + src/chrome/locale/es/torbutton.properties | 2 +- src/chrome/locale/fr/torbutton.properties | 4 +- src/chrome/locale/ja/aboutTor.dtd | 2 +- src/chrome/locale/ja/brand.dtd | 8 +-- src/chrome/locale/ja/torbutton.dtd | 54 ++++++++--------- src/chrome/locale/ja/torbutton.properties | 32 +++++------ src/chrome/locale/ko/aboutTor.dtd | 28 ++++----- src/chrome/locale/nl/torbutton.properties | 6 +- src/chrome/locale/pl/torbutton.properties | 2 +- src/chrome/locale/pt/torbutton.dtd | 80 +++++++++++++------------- src/chrome/locale/pt/torbutton.properties | 6 +- src/chrome/locale/ru/torbutton.properties | 2 +- src/chrome/locale/zh-CN/torbutton.properties | 2 +- src/install.rdf | 2 +- 18 files changed, 123 insertions(+), 117 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 62d20d2..a46336a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.2.6 + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + 1.9.2.5 * Translation updates diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 25366b0..67e04ad 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "Dieser Browser ist nicht mehr aktuell."> <!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet."> -<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel and wählen Sie dann Überprüfe auf Tor-Browser Aktualisierung."> +<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie dann Suche nach Tor-Browser-Aktualisierung."> <!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen"> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 0643b70..8b57de6 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Dieser Browser torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Brücke torbutton.circuit_display.unknown_country = Unbekanntes Land -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen. torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en/brand.dtd index cc65346..3df1a08 100644 --- a/src/chrome/locale/en/brand.dtd +++ b/src/chrome/locale/en/brand.dtd @@ -2,6 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index e732fa6..0715b9c 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = repetidor torbutton.circuit_display.tor_bridge = Repetidor puente (bridge) torbutton.circuit_display.unknown_country = País desconocido -torbutton.content_sizer.margin_tooltip = El navegador Tor agrega este margenes de alto y ancho de su ventana, esto reduce la posibilidad de la gente de rastrearlo en linea. +torbutton.content_sizer.margin_tooltip = El Navegador Tor añade este margen para hacer el ancho y el alto de su ventana menos distintivo, y reducir de esta forma la capacidad de la gente de rastrearle en línea. torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor torbutton.panel.plugins.disabled = Haga clic para habilitar extensiones (plugins). diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index f20d3b7..6304f07 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relais torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour s'assurer que la largeur et la hauteur de votre fenêtre soit moins distinctive, et ainsi réduire la capacité des personnes à vous repérer en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.plugins.disabled = Cliquer pour activer les plugins @@ -15,7 +15,7 @@ torbutton.panel.plugins.enabled = Cliquer pour désactiver les plugins torbutton.panel.label.disabled = Tor Inactif torbutton.panel.label.enabled = Tor Actif extensions.torbutton(a)torproject.org.description = Torbutton fournit un bouton pour configurer les paramètres de Tor et nettoie rapidement et facilement les données de navigation privée. -torbutton.popup.history.warning = Torbutton a bloqué l'activité provenant d'un onglet ouvert dans un état Tor différent.\n\nCeci permet de contourner les bugs Firefox 409737 et 417869.\n\nSi ce message d'erreur semble apparaître sans raison, un de vos onglets est en train de se rafraîchir en l'arrière-plan, et il a été bloqué.\n\nAfin de rafraîchir l'onglet dans l'état Tor actuel, faire "entrer" dans barre d'adresse de l'URL.\n\n +torbutton.popup.history.warning = Torbutton a bloqué l'activité provenant d'un onglet ouvert dans un état Tor différent.\n\nCeci permet de contourner les bugs Firefox 409737 et 417869.\n\nSi ce message d'erreur semble apparaître sans raison, un de vos onglets est en train de se rafraîchir en l'arrière-plan, et il a été bloqué.\n\nAfin de rafraîchir l'onglet dans l'état Tor actuel, appuyer sur "entrer" dans la barre d'adresse de l'URL.\n\n torbutton.popup.plugin.warning = Torbutton a bloqué le chargement direct par Tor du contenu du plugin.\n\nUtiliser plutôt la fonction Enregistrer sous.\n\n torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat d'Autorité personnalisé. Examiner la liste des Certificats d'Autorité est une opération lente qui ralentit la bascule vers Tor. Voulez-vous désactiver l'isolation des Certificats d'Autorité ? (Si vous ne comprenez pas, il est bon de répondre OK) torbutton.popup.ff3.warning = Attention !\n\nTorbutton sur Firefox 3 est connu pour révéler votre fuseau horaire et vos livemarks par Tor.\n\nVoulez vous continuer malgré tout? diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index fe1edef..974820c 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "しかし、このブラウザは古いバージョンです。"> <!ENTITY aboutTor.outOfDateTorOff.label "また、このブラウザは古いバージョンです。"> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Onion をクリックして Tor Browser のアップデートを確認してください。"> <!ENTITY aboutTor.check.label "Torのネットワーク設定をテストする"> diff --git a/src/chrome/locale/ja/brand.dtd b/src/chrome/locale/ja/brand.dtd index 35a8894..2efb954 100644 --- a/src/chrome/locale/ja/brand.dtd +++ b/src/chrome/locale/ja/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "FirefoxおよびFirefoxのロゴはMozilla財団の登録商標です。">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "クリックするとインストールされたシステムプラグインをロードします。"> +<!ENTITY plugins.installed.enable "プラグインを有効化"> +<!ENTITY plugins.installed.disable "プラグインを無効化"> +<!ENTITY plugins.installed.disable.tip "クリックするとインストールされたプラグインを読み込まなくします。"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 4bdafc2..0abce4d 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -36,7 +36,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie の防御"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "TorのURLをコピー"> <!ENTITY torbutton.context_menu.copyTor.key "p"> @@ -153,35 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> <!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> <!ENTITY torbutton.prefs.sec_low "低い(デフォルト)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "最大の利便性を提供します。"> +<!ENTITY torbutton.prefs.sec_low_desc "このレベルでは、全てのブラウザーの機能が有効化されます。"> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType フォントレンダリング機能は無効化されます。"> <!ENTITY torbutton.prefs.sec_med_low "中の低"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "このレベルでは、以下の変更が適用されます。(マウスを重ねると詳細を表示)"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 の映像と音楽は No-Script によりクリックするまで再生されません。"> +<!ENTITY torbutton.prefs.sec_html5_tooltip "いくつかのサイトでは、メディアを有効にするために No-Script ツールバーを使う必要があります。"> +<!ENTITY torbutton.prefs.sec_some_jit_desc "いくつかの JavaScript のパフォーマンス最適化が無効化されます。"> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、型インターフェイス、ASM.JS。"> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "基本的なJIT。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "サイトによってはスクリプトの動作が遅くなります。"> +<!ENTITY torbutton.prefs.sec_jar_desc "リモートの JAR ファイルがブロックされます。"> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Web 上で JAR ファイルが利用されることは稀ですが、 XSS などに使われることがあります。"> +<!ENTITY torbutton.prefs.sec_mathml_desc "数式を表示するためのいくつかの機能が無効化されます。"> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML が無効化されます。"> <!ENTITY torbutton.prefs.sec_med_high "中の上"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "全ての JavaScript のパフォーマンス最適化機能が無効化されます。"> +<!ENTITY torbutton.prefs.sec_font_rend_desc "いくつかのフォントレンダリング機能が無効化されます。"> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite フォントレンダリング機能は無効化されます。"> +<!ENTITY torbutton.prefs.sec_svg_desc "いくつかの画像の種類が無効化されます。"> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG 画像は無効化されます。"> +<!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS ではないサイトの JavaScript はデフォルトで無効化されます。"> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "No-Script ツールバーからサイトごとに JavaScript を有効化できます。"> <!ENTITY torbutton.prefs.sec_high "高い"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_all_js_desc "全てのサイトの JavaScript はデフォルトで無効化されます。"> +<!ENTITY torbutton.prefs.sec_audio_video_desc "ほとんどの映像と音楽形式は無効化されます。"> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM 形式だけが有効化されます。"> +<!ENTITY torbutton.prefs.sec_webfonts_desc "いくつかのフォントとアイコンは正常に表示されません。"> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web サイトが提供するフォントはブロックされます。"> <!ENTITY torbutton.prefs.sec_custom "カスタム値"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 0dfb4d6..554cd6f 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -1,13 +1,13 @@ torbutton.button.tooltip.disabled = Torを有効にする torbutton.button.tooltip.enabled = Torを無効にする -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.onion_site = Onion site -torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.circuit_display.internet = インターネット +torbutton.circuit_display.ip_unknown = 不明なIP +torbutton.circuit_display.onion_site = Onion サイト +torbutton.circuit_display.this_browser = このブラウザー +torbutton.circuit_display.relay = リレー +torbutton.circuit_display.tor_bridge = ブリッジ +torbutton.circuit_display.unknown_country = 不明な国 +torbutton.content_sizer.margin_tooltip = Tor Browser はウィンドウのサイズを平凡にするためにこのマージンを追加します。これにより、あなたのことをオンラインで追跡しにくくします。 torbutton.panel.tooltip.disabled = クリックしてTorを有効にする torbutton.panel.tooltip.enabled = クリックしてTorを無効にする torbutton.panel.plugins.disabled = プラグインを有効にする @@ -54,12 +54,12 @@ torbutton.popup.short_torbrowser = 重要なTorbuttonの情報!\n\nTorbuttonは torbutton.popup.confirm_plugins = Flashなどのプラグインはあなたのプライバシーや匿名性を損なう恐れがあります。 \n\nそれらはTorを迂回しあなたの現在の位置やIPアドレスを漏らしてしまう恐れがあります。\n\n本当にプラグインを有効にしますか？\n\n torbutton.popup.never_ask_again = 次からはたずねない -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor Browser は全てのウィンドウとタブを閉じようとしています。全てのセッションは失われます。\n\nあなたの情報をリセットするために Tor Browser を再起動しますか？\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Green onion menu にセキュリティレベルを調節するためのスライダーが追加されました！お試しください！ +torbutton.slider_notification_button = セキュリティの設定を開く -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Tor Browser を最大化すると、Webサイトはあなたのモニターサイズを利用して追跡できるようになります。Tor Browser のウィンドウのサイズは初期状態のままにしておくことをおすすめします。 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=このWebサイト(%S)がHTML5 canvas画像を使用しようとしています。これはあなたのコンピューターを識別するために使われる可能性があります。\n\nTor ブラウザーにHTML5 canvas画像の使用を許可しますか？ @@ -72,7 +72,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileProblemTitle=%S プロファイル問題 +profileReadOnly=読み込み専用のファイルシステムでは %S を実行できません。 %S を別の場所に移動してからもう一度実行してください。 +profileReadOnlyMac=読み込み専用のファイルシステムでは %S を実行できません。 %S をデスクトップやアプリケーションフォルダーに移動してからもう一度実行してください。 +profileAccessDenied=%S はプロファイルにアクセスする権限がありません。権限を設定してからもう一度試してみてください。 diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 53f141e..523188e 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -4,20 +4,20 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "Tor란?"> +<!ENTITY aboutTor.title "Tor에 대해서"> -<!ENTITY aboutTor.outOfDateTorOn.label "그러나, 이 브라우저가 업데이트 되지 않았습니다."> -<!ENTITY aboutTor.outOfDateTorOff.label "또한, 이 브라우저가 업데이트 되지 않았습니다."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "그 러 나, 이 브라우저는 오래되었습니다."> +<!ENTITY aboutTor.outOfDateTorOff.label "또 한, 이 브라우저는 오래되었습니다."> +<!ENTITY aboutTor.outOfDate2.label "onion을 클릭하고 Tor Browser 업데이트 체크를 선택하세요."> <!ENTITY aboutTor.check.label "Tor 네트워크 설정 테스트"> <!ENTITY aboutTor.success.label "축하합니다!"> <!ENTITY aboutTor.success2.label "이 브라우저는 Tor를 사용하도록 구성되었습니다."> -<!ENTITY aboutTor.success3.label "여러분은 이제 익명으로 자유롭게 인터넷을 탐색 할 수 있습니다."> -<!ENTITY aboutTor.failure.label "뭔가 문제가 발생하였습니다."> -<!ENTITY aboutTor.failure2.label "Tor가 이 브라우저에서 작동하지 않습니다."> -<!ENTITY aboutTor.failure3prefix.label "도움이 필요한 경우 접속하시길 바랍니다."> +<!ENTITY aboutTor.success3.label "이제 자유롭게 익명으로 인터넷을 탐색할 수 있습니다."> +<!ENTITY aboutTor.failure.label "뭔가 잘못되었습니다!"> +<!ENTITY aboutTor.failure2.label "Tor는 이 브라우저에서 작동하지 않습니다."> +<!ENTITY aboutTor.failure3prefix.label "도움을 위해서, 문의해 주세요"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label " "> @@ -29,21 +29,21 @@ <!ENTITY aboutTor.torInfo1.label "추가 정보 :"> <!ENTITY aboutTor.torInfo2.label "국가 & IP 주소 :"> -<!ENTITY aboutTor.torInfo3.label "출구 node : "> +<!ENTITY aboutTor.torInfo3.label "출구 노드: "> <!ENTITY aboutTor.torInfo4.label "이 서버는 방문자에 대한 정보를 기록하지 않습니다."> <!ENTITY aboutTor.whatnextQuestion.label "그 다음은?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor는 절대로 '완벽한' 익명을 보장하는 브라우저가 아닙니다. 때문에 '완벽한' 익명을 위해서는 브라우저 사용 습관을 바꾸셔야 합니다."> +<!ENTITY aboutTor.whatnextAnswer.label "Tor는 완벽한 익명 브라우징을 보장하지 않습니다! 따라서 신분을 안전하게 유지하기 위해서는 브라우징 습관을 바꾸셔야 합니다."> <!ENTITY aboutTor.whatnext.label "익명으로 알짱거릴 때의 팁 >>"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "여러분도 도울 수 있습니다!"> <!ENTITY aboutTor.helpInfo2.label "여러분이 Tor 네트워크를 보다 빠르고 강하게 만들 수 있는 방법이 있습니다."> -<!ENTITY aboutTor.helpInfo3.label "Tor 중계 서버 node 실행 >>"> +<!ENTITY aboutTor.helpInfo3.label "Tor 중계 서버 node 실행 »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "자원 봉사로 Tor 돕기 >>"> +<!ENTITY aboutTor.helpInfo4.label "자원 봉사로 Tor 돕기 »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "기부하기 >>"> +<!ENTITY aboutTor.helpInfo5.label "후원하기 »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "Tor 프로젝트란? 온라인 익명 및 개인 정보 보호의 연구, 개발 및 교육에 힘쓰는 US 501(c)(3) 비영리 단체입니다."> -<!ENTITY aboutTor.learnMore.label "Tor 프로젝트에 대하여 더 알고 싶으시다면 >>"> +<!ENTITY aboutTor.learnMore.label "Tor 프로젝트에 대해서 더 알아보기 »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 0b7445b..08b77aa 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -1,13 +1,13 @@ torbutton.button.tooltip.disabled = Tor inschakelen torbutton.button.tooltip.enabled = Tor uitschakelen torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = Onbekend IP adres +torbutton.circuit_display.ip_unknown = IP-adres onbekend torbutton.circuit_display.onion_site = Onion-site torbutton.circuit_display.this_browser = Deze browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Onbekend land -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen. torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen torbutton.panel.plugins.disabled = Hier klikken om plugins in te schakelen @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten torbutton.slider_notification = Het groene ui menu heeft nu een schuif regelaar waar u uw veiligheids level aan kunt passen. Bekijk het eens! torbutton.slider_notification_button = Open de beveiligingsvoorkeuren -torbutton.maximize_warning = Het maximeren van Tor Browser stelt web paginas in de staat de grote van uw monitor vast te stellen en dat kan gebruik worden om u te tracken. Wij raden aan om het Tor Browser venster in zijn originele staat de laten. +torbutton.maximize_warning = Het maximaliseren van Tor Browser stelt webpagina's in staat uw beeldschermgrootte vast te stellen; dit kan worden gebruikt om u te traceren. We raden aan dat u vensters van Tor Browser in hun oorspronkelijke grootte laat. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=De website (%S) heeft geprobeerd HTML5 canvas image data op te vragen, wat kan gebruikt worden voor een unieke identificatie van je computer.\n\nMoet Tor Browser deze website toestaan om HTML5 canvas image data op te vragen? diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 78ba154..8b60e26 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Ta przeglądarka torbutton.circuit_display.relay = przekaźnik torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Nieznane państwo -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Przeglądarka Tor dodaje ten margines po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online. torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora torbutton.panel.plugins.disabled = Kliknij aby włączyć wtyczki diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 0ba6607..e946ff2 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -1,58 +1,58 @@ <!ENTITY torbutton.prefs.title "Preferências Torbutton"> <!ENTITY torbutton.prefs.tor_settings "Configurações do Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utilizar as configurações recomendadas do proxy para minha versão do Firefox"> +<!ENTITY torbutton.prefs.recommended_settings "Utilize as configurações recomendadas do proxy para a minha versão do Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy"> -<!ENTITY torbutton.prefs.use_polipo "Utilizar Privoxy"> -<!ENTITY torbutton.prefs.custom_settings "Utilizar configurações padrão do proxy"> +<!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo"> +<!ENTITY torbutton.prefs.custom_settings "Utilize as configurações do proxy personalizadas"> <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:"> <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:"> <!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:"> <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Porto:"> +<!ENTITY torbutton.prefs.proxy.host.socks "Hospedeiro SOCKS:"> +<!ENTITY torbutton.prefs.proxy.port "Porta:"> <!ENTITY torbutton.about.title "Sobre o Torbutton"> <!ENTITY torbutton.about.version "Versão:"> -<!ENTITY torbutton.about.summary "Protege a privacidade da navegação do Tor."> -<!ENTITY torbutton.about.code "Contribuidores de Código:"> +<!ENTITY torbutton.about.summary "Protege a privacidade da sua navegação Tor."> +<!ENTITY torbutton.about.code "Contribuidores do Código:"> <!ENTITY torbutton.about.maintainer "Mantenedor:"> <!ENTITY torbutton.about.security_review "Revisão de Segurança:"> -<!ENTITY torbutton.about.donate "Se gosta de usar o Tor, poderá considerar"> -<!ENTITY torbutton.about.make_donation "fazer uma doação"> -<!ENTITY torbutton.pref_connection.notice "Desactivar o Torbutton para mudar estas configurações."> -<!ENTITY torbutton.pref_connection.more_info "Mais informações"> +<!ENTITY torbutton.about.donate "Se gosta de utilizar o Tor, poderá considerar"> +<!ENTITY torbutton.about.make_donation "efetuar uma doação"> +<!ENTITY torbutton.pref_connection.notice "Desativar o Torbutton para alterar estas configurações."> +<!ENTITY torbutton.pref_connection.more_info "Mais informação"> <!ENTITY torbutton.pref_connection_more_info.title "Ajuda"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo. Se deseja mudar as configurações de Proxy que não sejam do Tor, por favor desactive o Torbutton e volte aqui. Se deseja alterar as configurações do Tor, por favor, use a janela de preferências do Torbutton."> +<!ENTITY torbutton.pref_connection_more_info.text "O Torbutton está ativado. Se desejar alterar as configurações do Proxy que não sejam do Tor, por favor, desative o Torbutton e volte aqui. Se desejar alterar as configurações do Tor, por favor, utilize a janela de preferências do Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Identidade Nova"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "Novo circuito Tor para este site"> +<!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.toggle "Alterar Status Tor"> +<!ENTITY torbutton.context_menu.toggle "Alterar Estado do Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Definições de segurança e privacidade..."> +<!ENTITY torbutton.context_menu.preferences "Configurações de Segurança e Privacidade..."> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Sobre o Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Definições de rede do Tor..."> +<!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizações do Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Procurar por Atualizações do Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Proteções para Cookies..."> +<!ENTITY torbutton.context_menu.cookieProtections "Proteções para os Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Copiar endereço do Tor"> +<!ENTITY torbutton.context_menu.copyTor "Copiar URL do Tor"> <!ENTITY torbutton.context_menu.copyTor.key "P"> -<!ENTITY torbutton.context_menu.openTorTab "Abrir endereço do Tor numa nova Aba"> +<!ENTITY torbutton.context_menu.openTorTab "Abrir URL do Tor num novo Separador"> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Abrir endereço do Tor numa nova página"> +<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL do Tor numa nova Janela"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacidade e Definições de Segurança"> +<!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacidade e Configurações de Segurança"> <!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do Tor (crucial)"> -<!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do Tor (recomendado)"> -<!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do Tor (opcional)"> -<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrita no histórico durante a não utilização do Tor (opcional)"> -<!ENTITY torbutton.prefs.clear_history "Limpar histórico ao alterar o uso do Tor (opcional)"> -<!ENTITY torbutton.prefs.clear_cache "Bloquear a cópia local e limpar todos as cópias ao alterar o uso do Tor"> +<!ENTITY torbutton.prefs.block_thwrite "Bloquear a gravação no histórico durante a utilização do Tor (recomendado)"> +<!ENTITY torbutton.prefs.block_nthread "Bloquear a leitura do histórico durante a não utilização do Tor (opcional)"> +<!ENTITY torbutton.prefs.block_nthwrite "Bloquear a gravação no histórico durante a não utilização do Tor (opcional)"> +<!ENTITY torbutton.prefs.clear_history "Limpar histórico ao alternar a utilização do Tor (opcional)"> +<!ENTITY torbutton.prefs.clear_cache "Bloquear a cache do disco Tor e limpar toda a cache ao alternar a utilização do Tor"> <!ENTITY torbutton.prefs.block_cache "Bloquear cache de memória e disco durante o uso do Tor"> <!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies não-Tor num local protegido"> <!ENTITY torbutton.prefs.cookie_protection "Usar a caixa de diálogo das Proteções dos Cookies para escolher"> @@ -165,23 +165,23 @@ <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de base JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sítios poderão funcionar muito lentamente."> <!ENTITY torbutton.prefs.sec_jar_desc "Os ficheiros JAR remotos estão bloqueados."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Os ficheiros JAR são extremamente raros na Web, mas podem ser uma fonte de XSS e outros ataques."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos de visualização de equações matemáticas estão desativados."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML está desativado."> <!ENTITY torbutton.prefs.sec_med_high "Médio-Alto"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Todas as otimizações de desempenho JavaScript estão desativadas."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Algumas funções de renderização do tipo de letra estão desativadas."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderização do tipo de letra Graphite está desativado."> +<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagens estão desativados."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "As imagens SVG estão desativadas."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript está desativado por predefinição em todos os sites não HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado numa base de per-sítio através do botão da barra de ferramentas NoScript."> <!ENTITY torbutton.prefs.sec_high "Alto"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está desativado por predefinição em todos os sítios."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "A maioria dos formatos de áudio e vídeo estão desativados."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM é o único codec que se mantém ativado."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipos de letra e ícones poderão ser visualizados incorretamente."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Os ficheiros dos tipos de letra fornecidos pelo sítio da Web estão bloqueados."> <!ENTITY torbutton.prefs.sec_custom "Valores definidos"> <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site"> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 0dc5004..ceec3a8 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = retransmitir torbutton.circuit_display.tor_bridge = Ponte torbutton.circuit_display.unknown_country = País desconhecido -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = O Navegador Tor adiciona esta margem para realçar a altura e a largura da sua janela, e com isso reduz a possibilidade de as pessoas on-line o possam rastrear. torbutton.panel.tooltip.disabled = Clique para ativar o Tor torbutton.panel.tooltip.enabled = Clique para desativar o Tor torbutton.panel.plugins.disabled = Clique para ativar os plugins @@ -56,10 +56,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Não voltar a perguntar-me torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = Agora, o menu da cebola verde tem um cursor de segurança que o deixa ajustar o seu nível de segurança. Verifique-o! torbutton.slider_notification_button = Abra as definições de segurança -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Ao maximizar o Navegador Tor pode permitir que os sítios da Web determinem o tamanho do seu monitor, o que poderá ser utilizado para o rastrear. Nós recomendamos que deixe as janelas do Navegador no seu tamanho original predefinido. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este site (%S) tentou extrair informação HTML5, que pode ser usada para identificar claramente o seu computador.\n\nQuer que o navegador Tor permita que o site extraia a informação HTML5? diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index a75acb7..62af84b 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Этот браузер torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, и это усложняет возможность отследить Вас в сети. torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 8871ba6..385ce6c 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = 本浏览器 torbutton.circuit_display.relay = 中继 torbutton.circuit_display.tor_bridge = 网桥 torbutton.circuit_display.unknown_country = 未知国家 -torbutton.content_sizer.margin_tooltip = Tor 浏览器添加此差额，使您的窗口宽度和高度总是稍有差异，从而减少人们跟踪您的在线活动的能力。 +torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了这些边框，使浏览器窗口的宽高变得不再那么独特，从而让在线跟踪监视变得更难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor torbutton.panel.plugins.disabled = 点击启用插件 diff --git a/src/install.rdf b/src/install.rdf index ba6b09f..8379338 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.9.2.5</em:version> + <em:version>1.9.2.6</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

[torbutton/master] Revert "Bug 14429: Enable auto-resizing; disable maximization warning."
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit f35b2f858359289d1c47967d34ca03bd678397c8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 12:01:18 2015 +0000 Revert "Bug 14429: Enable auto-resizing; disable maximization warning." This reverts commit 9690abf00de1dbc09fe070b72007a2fca3e6270c for the stable Tor Browser series. --- src/defaults/preferences/preferences.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 4d1dee0..68c4f60 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -118,7 +118,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 0); +pref("extensions.torbutton.maximize_warnings_remaining", 3); pref("extensions.torbutton.startup_resize_period", true); // Security prefs: @@ -159,7 +159,7 @@ pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.resize_windows",true); +pref("extensions.torbutton.resize_windows",false); pref("extensions.torbutton.banned_ports","9050,9051,9150,9151"); pref("extensions.torbutton.block_tor_file_net",true); pref("extensions.torbutton.block_nontor_file_net",false);

1 0