December 2013 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit 5327de3c7cd97dba02ea2ec938d0f09f4c01d84d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 11:45:51 2013 +0000 Update translations for https_everywhere --- id/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index b13f015..ca7aace 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -41,6 +41,6 @@ <!ENTITY https-everywhere.popup.keep "Tetapkan saya di versi pengembangan"> <!ENTITY https-everywhere.popup.revert "Unduh versi stabil terakhir"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_title "Pengujian aturan HTTPS Everywhere"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Batal"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Mulai">

1 0

[tor-browser-bundle/master] Bug #9830: Bump mingw-w64 version to fix compile issue with Firefox 24 ESR
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 6a581a2b05666d13e5c87144f4d6aa2fb77cb68a Author: Georg Koppen <georg(a)getfoxyproxy.org> Date: Wed Nov 27 20:50:23 2013 -0800 Bug #9830: Bump mingw-w64 version to fix compile issue with Firefox 24 ESR Only bump the version for FF24 builds for now. --- gitian/fetch-inputs.sh | 19 ++++++++++++++++--- gitian/versions.alpha | 4 ++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 82a0b50..5831002 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -99,6 +99,12 @@ update_git() { fi } +checkout_mingw() { + svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1 + # XXX: Path + ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn +} + ############################################################################## # Get package files from mirror @@ -173,9 +179,16 @@ wget -U "" -N ${NOSCRIPT_URL} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; then - svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1 - # XXX: Path - ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn + checkout_mingw +else + # We do have mingw-w64 already but is it the correct revision? We check the + # hash of the zip archive as it has to be changed as well if a new revision + # should be used. + if ! echo "${MINGW_HASH} ${MINGW_PACKAGE}" | sha256sum -c -; then + # We need to update the local mingw-w64 copy + rm -rf mingw-w64-svn* + checkout_mingw + fi fi # Verify packages with weak or no signatures via direct sha256 check diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3649fe7..ab6e9cb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -12,7 +12,7 @@ HTTPSE_TAG=3.4.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_REV=5830 +MINGW_REV=6184 GITIAN_TAG=tor-browser-builder-3.0-4 @@ -38,7 +38,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f -MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b +MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs

1 0

[tor-browser-bundle/master] Bug #9828: Fix python and omni.ja for Mac and Windows.
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 15fb918cae1e97b1886ba85289a90afb70bf0f4f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 27 20:12:26 2013 -0800 Bug #9828: Fix python and omni.ja for Mac and Windows. Firefox requires python 2.7 now, and has a new omni.ja. --- gitian/descriptors/mac/gitian-bundle.yml | 9 +++++++-- gitian/descriptors/mac/gitian-firefox.yml | 19 +++++++++++++++++++ gitian/descriptors/windows/gitian-bundle.yml | 9 +++++++-- gitian/descriptors/windows/gitian-firefox.yml | 21 +++++++++++++++++++++ 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index ade303b..2ef8834 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -105,12 +105,17 @@ script: | cp versions TorBrowserBundle.app/Docs/sources/ cp bundle.inputs TorBrowserBundle.app/Docs/sources/bundle.inputs # - cd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + # FF24 puts the prefs in a different jar: + if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then + pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + else + pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + fi unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../../../../../ + popd # XXX: DMG plz cp -a TorBrowserBundle.app TorBrowserBundle_en-US.app ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip TorBrowserBundle_en-US.app diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 8230abc..d6e5b4a 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -26,10 +26,13 @@ files: - "i686-apple-darwin11-ld" - "re-dzip.sh" - "dzip.sh" +- "python.tar.bz2" +- "versions" #- "apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb" #- "apple-x86-odcctools_758.159-0flosoft11_i386.deb" script: | INSTDIR="$HOME/install/" + source versions export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC @@ -43,6 +46,19 @@ script: | mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/ mkdir -p $OUTDIR/ # + # XXX: Refactor this out into a separate descriptor + # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship + # with Python 2.6. Thus, we compile 2.7 ourselves... + if [ ${TORBROWSER_VERSION::3} != "3.0" ]; then + mkdir python + cd python + tar -xjvf ../python.tar.bz2 + Python-*/configure + make + sudo make install + cd .. + fi + # sudo dpkg -i *.deb chmod 755 i686* sudo cp i686* /usr/bin/ @@ -84,5 +100,8 @@ script: | cd $INSTDIR ~/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/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./TorBrowser.app cp tor-browser-mac${GBUILD_BITS}-gbuilt.zip $OUTDIR diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 44e1662..5ee9056 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -107,12 +107,17 @@ script: | cp ../versions "Tor Browser"/Docs/sources/ cp ../bundle.inputs "Tor Browser"/Docs/sources/ # - cd "Tor Browser"/Browser + # FF24 puts the prefs in a different jar: + if [ -f "Tor Browser"/Browser/browser/omni.ja ]; then + pushd "Tor Browser"/Browser/browser/ + else + pushd "Tor Browser"/Browser/ + fi unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../ + popd makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_en-US.exe # diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 31e782f..94b6ba0 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -32,8 +32,11 @@ files: - "i686-w64-mingw32-g++" - "i686-w64-mingw32-ld" - "msvcr100.dll" +- "python.tar.bz2" +- "versions" script: | INSTDIR="$HOME/install" + source versions export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC @@ -55,6 +58,21 @@ script: | # linked against msvcrt by default. See bug 9084 for a more detailed # discussion. + # + # XXX: Refactor this out into a separate descriptor + # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship + # with Python 2.6. Thus, we compile 2.7 ourselves... + if [ ${TORBROWSER_VERSION::3} != "3.0" ]; then + mkdir python + cd python + tar -xjvf ../python.tar.bz2 + Python-*/configure + make + sudo make install + cd .. + fi + # + # FIXME: We need sudo for all of this because otherwise # the toolchain can't find the alternate prefix for the CRT headers :/ @@ -180,5 +198,8 @@ script: | if [ -f Browser/webapprt/omni.ja ]; then ~/build/re-dzip.sh Browser/webapprt/omni.ja fi + if [ -f Browser/browser/omni.ja ]; then + ~/build/re-dzip.sh Browser/browser/omni.ja + fi ~/build/dzip.sh tor-browser-win32-gbuilt.zip Browser cp tor-browser-win32-gbuilt.zip $OUTDIR

1 0

[tor-browser-bundle/master] Fix #10213; change LDPATH→LD_LIBRARY_PATH in RelativeLink.sh.
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 4703dd9b3f917ee9ea6306c6ac6643e09cb563a7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 1 04:25:15 2013 +0000 Fix #10213; change LDPATH→LD_LIBRARY_PATH in RelativeLink.sh. --- RelativeLink/RelativeLink.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index b2255f6..4a10c58 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -206,8 +206,8 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then exit 1 fi -LDPATH="${HOME}/Tor/" -export LDPATH +LD_LIBRARY_PATH="${HOME}/Tor/" +export LD_LIBRARY_PATH # XXX: Debug mode for Firefox??

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'isis/fix/10213-LD_LIBRARY_PATH-missing' into ff24-staging
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit bfdbe3eb7d6aea8ef9aded9bd7fbc1da8275f1a4 Merge: 6a581a2 4703dd9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Dec 1 22:55:07 2013 -0800 Merge remote-tracking branch 'isis/fix/10213-LD_LIBRARY_PATH-missing' into ff24-staging RelativeLink/RelativeLink.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser-bundle/master] Linus is called linus.
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit b575c59a33367af3366d0461cd5815acf1217ef7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Dec 1 23:08:20 2013 -0800 Linus is called linus. --- gitian/check-match.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index 907fbfe..09bf179 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -3,7 +3,7 @@ # XXX: Args? HOST=people.torproject.org BASE_DIR=public_html/builds/ -USERS="ln5 mikeperry erinn gk" +USERS="linus mikeperry erinn gk" set -e set -u

1 0

[tor-browser/tor-browser-24.1.1esr-1] Make --enable-strip work again
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit a4fc2ee70f1511dfc258990f680b67bdae1fff78 Author: Georg Koppen <g.koppen(a)jondos.de> Date: Tue Nov 12 10:50:31 2013 +0100 Make --enable-strip work again Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=841373 --- config/rules.mk | 6 +++--- js/src/config/rules.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index f64edab..174af2c 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -883,7 +883,7 @@ else # !WINNT || GNU_CC endif # WINNT && !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -937,7 +937,7 @@ else endif # WINNT && !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -1051,7 +1051,7 @@ endif # WINNT && !GCC @$(RM) foodummyfilefoo $(DELETE_AFTER_LINK) chmod +x $@ ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index f64edab..174af2c 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -883,7 +883,7 @@ else # !WINNT || GNU_CC endif # WINNT && !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -937,7 +937,7 @@ else endif # WINNT && !GNU_CC ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -1051,7 +1051,7 @@ endif # WINNT && !GCC @$(RM) foodummyfilefoo $(DELETE_AFTER_LINK) chmod +x $@ ifdef ENABLE_STRIP - $(STRIP) $@ + $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@

1 0

[tor-browser/tor-browser-24.1.1esr-1] fixup! Build determinism fixes
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 1aeb666ddcb29fe80cecaa01d8239e63e4593e5f Author: Georg Koppen <g.koppen(a)jondos.de> Date: Thu Nov 28 10:28:58 2013 +0100 fixup! Build determinism fixes Bug 10235: fixing determinism issues when packaging (JavaScript) resources into omni.ja files; patch by Mike Hommey --- toolkit/mozapps/installer/precompile_cache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/precompile_cache.js b/toolkit/mozapps/installer/precompile_cache.js index f57145b..9ac2ada 100644 --- a/toolkit/mozapps/installer/precompile_cache.js +++ b/toolkit/mozapps/installer/precompile_cache.js @@ -65,7 +65,7 @@ function get_modules_under(uri) { } function load_modules_under(spec, uri) { - var entries = get_modules_under(uri); + var entries = get_modules_under(uri).sort(); // The precompilation of JS here sometimes reports errors, which we don't // really care about. But if the errors are ever reported to xpcshell's // error reporter, it will cause it to return an error code, which will break

1 0

[torbutton/master] Bug 10078: clearing crypto auth tokens; removing own handling of SSL session identifier cache as we get that for free when calling logoutAndTeardown()
by mikeperry＠torproject.org 02 Dec '13

02 Dec '13

commit 553789b32ad3cb26e854038e3db508072a72c2a2 Author: Georg Koppen <g.koppen(a)jondos.de> Date: Thu Nov 28 13:15:41 2013 +0100 Bug 10078: clearing crypto auth tokens; removing own handling of SSL session identifier cache as we get that for free when calling logoutAndTeardown() --- src/chrome/content/torbutton.js | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fcdc0d8..b47d394 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1465,22 +1465,12 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing Crypto Tokens"); - try { - // This clears the SSL identifier cache. - // See https://bugzilla.mozilla.org/show_bug.cgi?id=448747. But bug 683262 - // removes nsIDOMCrypto.logout(). We need to resort to our previous fallback - // method: switching a proper preference that triggers clearing the SSL - // identifier cache. - // See: https://mxr.mozilla.org/comm-esr24/source/mozilla/security/manager/ssl/src/… for the ones being available. - // secruity.enable_md5_signatures seems to be a good choice as it is still - // available on trunk. - m_tb_prefs.setBoolPref("security.enable_md5_signatures", !m_tb_prefs. - getBoolPref("security.enable_md5_signatures")); - m_tb_prefs.setBoolPref("security.enable_md5_signatures", !m_tb_prefs. - getBoolPref("security.enable_md5_signatures")); - } catch(e) { - torbutton_log(4, "Failed to clear SSL session ids: "+e); - } + // Clear all crypto auth tokens. This includes calls to PK11_LogoutAll(), + // nsNSSComponent::LogoutAuthenticatedPK11() and clearing the SSL session + // cache. + let sdr = Components.classes["@mozilla.org/security/sdr;1"]. + getService(Components.interfaces.nsISecretDecoderRing); + sdr.logoutAndTeardown(); // This clears the OCSP cache. //

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 02 Dec '13

02 Dec '13

commit 524ca5db863189a10ad66c3fea5c21a480680086 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 2 06:16:05 2013 +0000 Update translations for torbirdy_completed --- uk/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/torbirdy.properties b/uk/torbirdy.properties index 6c1acc4..8216ca0 100644 --- a/uk/torbirdy.properties +++ b/uk/torbirdy.properties @@ -15,5 +15,5 @@ torbirdy.email.advanced.title=TorBirdy розширені налаштуванн torbirdy.restart=Thunderbird необхідно перезапустити, щоб налаштування часового поясу вступили в силу. -torbirdy.firstrun=Зараз ви користуєтеся TorBirdy.\n\nДля захисту вашої анонімності TorBirdy відключає налаштування Thunderbird, якщо такі були встановленні +torbirdy.firstrun=Ви встановили TorBirdy.\n\nДля захисту вашої анонімності TorBirdy буде захищати налаштування Thunderbird, якщо такі були встановленні, тим самим захищаючи їх від змін, що були зроблені Вами або будь-яким додатком. Це декілька опцій, що можуть бути змінені і відповідають вподобанням TorBirdy. Якщо TorBirdy не встановлений або вимкнений, усі налаштування, що були змінені, повернуться на стандартні значення.\n\nЯкщо ви вперше встановили TorBirdy, рекомендуємо вам перейти на веб-сторінку TorBirdy для того, аби ви зрозуміли що ми намагаємося зробити для наших користу вачів. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0