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

[tor-browser-bundle/master] Add the Tor directory back in.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 454047fbc9a9523cd535d56969bd6514210b3c41 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 15:03:44 2013 -0800 Add the Tor directory back in. Got removed in the zlib purge. --- gitian/descriptors/linux/gitian-tor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index ddd81a7..df92f37 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -43,6 +43,8 @@ script: | export DEB_BUILD_HARDENING_PIE=1 # mkdir -p $INSTDIR/Data/Tor/ + mkdir -p $INSTDIR/Tor/ + mkdir -p $INSTDIR/Debug/Tor/ # cd libevent ./autogen.sh

1 0

[tor-browser-bundle/master] Remove PDF.JS 0.8.1 from all TBBs.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 10dd07067e4eea90b8f58acce7b00f518ff10844 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 01:49:15 2013 -0800 Remove PDF.JS 0.8.1 from all TBBs. It is probably vulnerable to https://www.mozilla.org/security/announce/2013/mfsa2013-99.html. Note that Firefox 24 includes a built-in version that will be getting security updates. --- gitian/descriptors/linux/gitian-bundle.yml | 1 - gitian/descriptors/mac/gitian-bundle.yml | 1 - gitian/descriptors/windows/gitian-bundle.yml | 1 - gitian/fetch-inputs.sh | 4 +--- gitian/record-inputs.sh | 3 --- gitian/versions | 2 -- gitian/versions.alpha | 2 -- 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 68e01ec..7dc1104 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -31,7 +31,6 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "uriloader(a)pdf.js.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index cdf387b..ade303b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -27,7 +27,6 @@ files: - "mac-skeleton.zip" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "uriloader(a)pdf.js.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index bb28155..44e1662 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -29,7 +29,6 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "uriloader(a)pdf.js.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 535a797..19b3509 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -169,7 +169,6 @@ cd .. # NoScript and PDF.JS are magikal and special: wget -N ${NOSCRIPT_URL} -wget -N https://addons.mozilla.org/firefox/downloads/file/201180/${PDFJS_PACKAGE} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; @@ -181,7 +180,7 @@ fi # 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 NOSCRIPT PDFJS MINGW MSVCR100 # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -217,7 +216,6 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi -ln -sf "$PDFJS_PACKAGE" uriloader(a)pdf.js.xpi ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 ln -sf "$PYTHON_PACKAGE" python.tar.bz2 diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 95a8fcf..9bc1f7c 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -30,10 +30,7 @@ sha256sum $OSXSDK_PACKAGE >> bundle.inputs sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs sha256sum mingw-w64-svn-snapshot.zip >> bundle.inputs echo >> bundle.inputs -#sha256sum relativelink-src.zip >> bundle.inputs -#sha256sum *-langpacks.zip >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs -sha256sum uriloader(a)pdf.js.xpi >> bundle.inputs echo >> bundle.inputs if [ "z$VERIFY_TAGS" = "z1" ]; diff --git a/gitian/versions b/gitian/versions index 4128288..0fea02e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,6 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi -PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_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 MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -39,7 +38,6 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f -PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d70d289..b605365 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,6 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi -PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_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 MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -39,7 +38,6 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f -PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[tor-browser-bundle/master] Bug #10049: Fix architecture check to work from outside TBB's directory.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 056dd50cf89fa2482c65f00f235a54493fbc3e6f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 02:16:09 2013 -0800 Bug #10049: Fix architecture check to work from outside TBB's directory. Patch by Moritz Bartl. --- RelativeLink/RelativeLink.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 6a4d05e..b2255f6 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -116,14 +116,6 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -SYSARCHITECTURE=$(getconf LONG_BIT) -TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF $[[:digit:]]*$') - -if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then - complain "Wrong architecture? 32-bit vs. 64-bit." - exit 1 -fi - debug=0 usage_message="usage: $0 [--debug]" if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then @@ -206,6 +198,14 @@ else export HOME fi +SYSARCHITECTURE=$(getconf LONG_BIT) +TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF $[[:digit:]]*$') + +if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then + complain "Wrong architecture? 32-bit vs. 64-bit." + exit 1 +fi + LDPATH="${HOME}/Tor/" export LDPATH

1 0

[torbrowser/maint-2.4] fix 32-bit Linux mozconfig name
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit eb17a2b2431f783b2ec07799ee8aad3f87511834 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 17:55:06 2013 -0200 fix 32-bit Linux mozconfig name --- build-scripts/config/mozconfig-lin-i686 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build-scripts/config/mozconfig-lin-i686 b/build-scripts/config/mozconfig-lin-i686 new file mode 100755 index 0000000..4421981 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-i686 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc

1 0

[torbrowser/master] fix 32-bit Linux mozconfig name
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit eb17a2b2431f783b2ec07799ee8aad3f87511834 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 17:55:06 2013 -0200 fix 32-bit Linux mozconfig name --- build-scripts/config/mozconfig-lin-i686 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build-scripts/config/mozconfig-lin-i686 b/build-scripts/config/mozconfig-lin-i686 new file mode 100755 index 0000000..4421981 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-i686 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit ea59f6997f36a6ee417533032845755fc71bf135 Merge: a860ada eb17a2b Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 17:55:24 2013 -0200 Merge branch 'maint-2.4' build-scripts/config/mozconfig-lin-i686 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 15 Nov '13

15 Nov '13

commit 5aeb045e6b7ec0ce96c7dfb3bdd1198b100d84be Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:46:03 2013 +0000 Update translations for liveusb-creator_completed --- sv/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index b571f68..31cb637 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-12 13:29+0100\n" -"PO-Revision-Date: 2013-11-14 19:11+0000\n" +"PO-Revision-Date: 2013-11-14 19:30+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -338,7 +338,7 @@ msgstr "Målenhet" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "Master Boot Record på din enhet är blank. MBR på denna enhet kommer att nollställas när du trycker på 'Installera Tails'." +msgstr "Master Boot Record på din enhet är tom. Tryck på 'Installera Tails' igen för att nollställa MBR på den här enheten." #: ../liveusb/gui.py:795 msgid "" @@ -568,7 +568,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer behållas oförändrad. Vill du fortsätta?" +msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer att behållas som den är. Vill du fortsätta?" #: ../liveusb/creator.py:607 msgid ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 15 Nov '13

15 Nov '13

commit 21321ac13e019734807f7232c77a276495b914ec Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:46:01 2013 +0000 Update translations for liveusb-creator --- sv/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index b571f68..31cb637 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-12 13:29+0100\n" -"PO-Revision-Date: 2013-11-14 19:11+0000\n" +"PO-Revision-Date: 2013-11-14 19:30+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -338,7 +338,7 @@ msgstr "Målenhet" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "Master Boot Record på din enhet är blank. MBR på denna enhet kommer att nollställas när du trycker på 'Installera Tails'." +msgstr "Master Boot Record på din enhet är tom. Tryck på 'Installera Tails' igen för att nollställa MBR på den här enheten." #: ../liveusb/gui.py:795 msgid "" @@ -568,7 +568,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer behållas oförändrad. Vill du fortsätta?" +msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer att behållas som den är. Vill du fortsätta?" #: ../liveusb/creator.py:607 msgid ""

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Nov '13

15 Nov '13

commit e8d5942b97e64f22b4bda649d6ce5366520f32d1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:45:58 2013 +0000 Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index c00f068..c7c28a5 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -43,4 +43,4 @@ <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regeltester"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Kör">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Nov '13

15 Nov '13

commit a649dddabd1a5005bfa03a348bffcd655010fd7f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:45:53 2013 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index c00f068..c7c28a5 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -43,4 +43,4 @@ <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regeltester"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Kör">

1 0