- tbb-commits - lists.torproject.org

[torbutton/master] Merge remote-tracking branch 'brade/bug13406-01'
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit 0ac77f28bed415b27942d5264b0e5037fb57c2a1 Merge: a717611 2ccb9cb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 14:51:05 2015 -0800 Merge remote-tracking branch 'brade/bug13406-01' src/chrome/content/popup.xul | 7 +++---- src/chrome/content/torbutton.js | 30 +++++++++--------------------- src/chrome/locale/en/aboutTor.dtd | 4 ++-- src/chrome/locale/en/torbutton.dtd | 2 +- src/chrome/skin/torbutton.css | 4 ++-- 5 files changed, 17 insertions(+), 30 deletions(-)

1 0

[torbutton/master] Bug 9387: Unlock the slider if "custom" is set
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit dd28b7b49cfc775afcc0adf9b922193acded9a7f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 4 13:08:12 2015 +0000 Bug 9387: Unlock the slider if "custom" is set If the custom mode is checked allow disabling it on the preference dialog directly by clicking on the description or dragging the thumb. --- src/chrome/content/preferences.js | 29 +++++++++++++---------------- src/chrome/content/preferences.xul | 1 - 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index f67906c..1151176 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -189,12 +189,15 @@ function torbutton_prefs_init(doc) { let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); sec_slider.value = o_torprefs.getIntPref('security_slider'); - sec_slider.disabled = custom_values; - // Setting |disabled| to |false| is not enough to have the element - // non-responding. We need to handle |movetoclick| as well. - sec_slider.setAttribute("movetoclick", !custom_values); sec_custom.checked = custom_values; sec_custom.disabled = !custom_values; + // If the custom checkbox is checked and the user is done with dragging + // uncheck the checkbox to allow setting the (newly) chosen security level. + sec_slider.dragStateChanged = function(isDragging) { + if (!isDragging && sec_custom.checked) { + sec_custom.checked = false; + } + } torbutton_prefs_set_field_attributes(doc); } @@ -462,17 +465,11 @@ function torbutton_prefs_reset_defaults() { } function torbutton_toggle_slider(doc, pos) { - let slider = doc.getElementById("torbutton_sec_slider"); - // onclick is active even if the element it belongs to is disabled. - if (pos && !slider.disabled) { - slider.value = pos; - } else { - if (doc.getElementById("torbutton_sec_custom").checked) { - slider.disabled = true; - slider.setAttribute("movetoclick", false); - } else { - slider.disabled = false; - slider.setAttribute("movetoclick", true); - } + doc.getElementById("torbutton_sec_slider").value = pos; + // Make sure the custom checkbox is unchecked as the user seems to want one + // of the defined security levels. + let sec_custom = doc.getElementById("torbutton_sec_custom"); + if (sec_custom.checked) { + sec_custom.checked = false; } } diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index cb5f1ab..57b013a 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -188,7 +188,6 @@ </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_toggle_slider(document, 0);" label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox>

1 0

[tor-browser-bundle/master] Bug 14526: Merge of #8405 breaks nightly builds
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ad82b1ef6f99a8468e6e02c0977546a23bd0149c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 11:27:17 2015 +0000 Bug 14526: Merge of #8405 breaks nightly builds --- gitian/descriptors/linux/gitian-tor.yml | 3 ++- gitian/descriptors/mac/gitian-tor.yml | 3 ++- gitian/descriptors/windows/gitian-tor.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f9795ea..87f3f10 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -80,7 +80,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 9cedf67..a772a74 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index dce98f8..9cbbb86 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Bump NoScript version in nightlies
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ab91d616e7eb015b1ca54e3130be85c302963d09 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 09:21:35 2015 +0000 Bump NoScript version in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4be76d8..16519f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -61,7 +61,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.11-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -91,7 +91,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +NOSCRIPT_HASH=568122b4834baf2113648317baf294879700178df157780a9c89582280338ba8 HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Fix stupid LOGSENDER bug.
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit cb718087cb08049ea3f672ac0461d7a1055ed267 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jan 28 14:07:26 2015 +0100 Fix stupid LOGSENDER bug. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 271f1ec..434d61b 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -73,6 +73,6 @@ else ../../gitian-builder/var/build.log \ ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ - $sender -- $LOGRECIPIENTS + $LOGSENDER -- $LOGRECIPIENTS fi fi

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/stupid-sender-bug'
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit 437e1beec2207dca79c2917b55b6f3a468150d7f Merge: e64e8d5 cb71808 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 28 14:12:22 2015 +0000 Merge remote-tracking branch 'linus/stupid-sender-bug' tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-bundle/maint-4.0] Bug #14420: Remove old auth cruft from fetch-inputs.sh
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit d4cfa02d22cefb43a5b66e6f0d10a876a78a3b33 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 08:03:44 2015 -0800 Bug #14420: Remove old auth cruft from fetch-inputs.sh --- gitian/fetch-inputs.sh | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index ef4dbf7..d4eee57 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -111,30 +111,13 @@ update_git() { } ############################################################################## -# Get package files from mirror - # Get+verify sigs that exist -for i in OPENSSL # OBFSPROXY -do - PACKAGE="${i}_PACKAGE" - URL="${MIRROR_URL}${!PACKAGE}" - SUFFIX="asc" - get "${!PACKAGE}" "$URL" - get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" - - if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then - echo "$i: GPG signature is broken for ${URL}" - mv "${!PACKAGE}" "${!PACKAGE}.badgpg" - exit 1 - fi -done - -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -179,29 +162,6 @@ do get "${!PACKAGE}" "${!URL}" done -# Verify packages with weak or no signatures via multipath downloads -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -# XXX: Google won't allow wget -N.. We need to re-download the whole -# TOOLCHAIN4 each time. Rely only on SHA256 for now.. -mkdir -p verify -cd verify -for i in OPENSSL OSXSDK -do - URL="${i}_URL" - PACKAGE="${i}_PACKAGE" - if ! wget -U "" -N --no-remove-listing "${!URL}"; then - echo "$i url ${!URL} is broken!" - mv "${!PACKAGE}" "${!PACKAGE}.removed" - exit 1 - fi - if ! diff "${!PACKAGE}" "../${!PACKAGE}"; then - echo "Package ${!PACKAGE} differs from our mirror's version!" - exit 1 - fi -done - -cd .. - # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} wget -U "" -N ${HTTPSE_URL}

1 0

[tor-browser-bundle/maint-4.0] Bug 14420: Also verify OpenSSL during tag check.
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit 7082e1ff92942409eea40a7d19b5bba25a9a0272 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 09:30:00 2015 -0800 Bug 14420: Also verify OpenSSL during tag check. --- gitian/verify-tags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index b7a89f1..c9e9a0f 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -116,12 +116,12 @@ faketime $FAKETIME_TAG EOF # Verify signatures on signed packages -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig"

1 0

[tor-browser-bundle/master] Bug #14420: Remove old auth cruft from fetch-inputs.sh
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit 9a8c0663abb0359b743865bca24b22316bb16fac Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 08:05:16 2015 -0800 Bug #14420: Remove old auth cruft from fetch-inputs.sh --- gitian/fetch-inputs.sh | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 3311547..fdbbc69 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,30 +112,13 @@ update_git() { } ############################################################################## -# Get package files from mirror - # Get+verify sigs that exist -for i in OPENSSL # OBFSPROXY -do - PACKAGE="${i}_PACKAGE" - URL="${MIRROR_URL}${!PACKAGE}" - SUFFIX="asc" - get "${!PACKAGE}" "$URL" - get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" - - if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then - echo "$i: GPG signature is broken for ${URL}" - mv "${!PACKAGE}" "${!PACKAGE}.badgpg" - exit 1 - fi -done - -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -189,29 +172,6 @@ do get "${!PACKAGE}" "${MIRROR_URL_YAWNING}${!PACKAGE}" done -# Verify packages with weak or no signatures via multipath downloads -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -# XXX: Google won't allow wget -N.. We need to re-download the whole -# TOOLCHAIN4 each time. Rely only on SHA256 for now.. -mkdir -p verify -cd verify -for i in OPENSSL OSXSDK -do - URL="${i}_URL" - PACKAGE="${i}_PACKAGE" - if ! wget -U "" -N --no-remove-listing "${!URL}"; then - echo "$i url ${!URL} is broken!" - mv "${!PACKAGE}" "${!PACKAGE}.removed" - exit 1 - fi - if ! diff "${!PACKAGE}" "../${!PACKAGE}"; then - echo "Package ${!PACKAGE} differs from our mirror's version!" - exit 1 - fi -done - -cd .. - # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} wget -U "" -N ${HTTPSE_URL}

1 0

[tor-browser-bundle/master] Bug 14420: Also verify OpenSSL during tag check.
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit e64e8d53b511525671d83d6d3631f82388b5e7bc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 09:30:00 2015 -0800 Bug 14420: Also verify OpenSSL during tag check. --- gitian/verify-tags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 55bb857..df30143 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -120,12 +120,12 @@ goxcrypto $GO_X_CRYPTO_TAG EOF # Verify signatures on signed packages -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig"

1 0