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

[torbrowser/maint-2.4] Remove 3.0alpha4 from the list of recommended TBB versions.
by mikeperry＠torproject.org 07 Nov '13

07 Nov '13

commit fb560d737d2dbe82a8e86a95c4647298b1e6df30 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 6 19:06:22 2013 -0800 Remove 3.0alpha4 from the list of recommended TBB versions. --- build-scripts/recommended-versions | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index fc84f09..3d2cb2d 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -5,9 +5,6 @@ "2.4.17-rc-1-MacOS", "2.4.17-rc-1-Windows", "2.4.17-rc-1-Linux", -"3.0-alpha-4-Linux", -"3.0-alpha-4-MacOS", -"3.0-alpha-4-Windows", "3.0-beta-1-Linux", "3.0-beta-1-MacOS", "3.0-beta-1-Windows"

1 0

[tor-browser-bundle/master] Support building an alternate 'alpha' version for FF24.
by mikeperry＠torproject.org 07 Nov '13

07 Nov '13

commit 01c6ce6472cbd341367df9b856aba08e46d51eb5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 6 18:41:18 2013 -0800 Support building an alternate 'alpha' version for FF24. --- gitian/Makefile | 16 +++++++++++++-- gitian/README.build | 18 +++++++++------- gitian/fetch-inputs.sh | 30 +++++++++++++++------------ gitian/mkbundle-linux.sh | 7 ++++++- gitian/mkbundle-mac.sh | 7 ++++++- gitian/mkbundle-windows.sh | 7 ++++++- gitian/versions.alpha | 49 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 109 insertions(+), 25 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index d34b59a..7fe3894 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,20 +1,32 @@ all: clean prep build +alpha: clean prep-alpha build-alpha + build: ./mkbundle-linux.sh ./mkbundle-windows.sh ./mkbundle-mac.sh ./hash-bundles.sh +build-alpha: + ./mkbundle-linux.sh versions.alpha + ./mkbundle-windows.sh versions.alpha + ./mkbundle-mac.sh versions.alpha + ./hash-bundles.sh + prep: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ + torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions + +prep-alpha: + ./check-prerequisites.sh + torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha clean: rm -f ../../gitian-builder/inputs/*gbuilt* rm -f ../../gitian-builder/inputs/*.yml rm -f ../../gitian-builder/inputs/bundle.inputs - rm -f ../../gitian-builder/inputs/versions + rm -f ../../gitian-builder/inputs/versions* rm -f ../../gitian-builder/inputs/*debug.zip vmclean: diff --git a/gitian/README.build b/gitian/README.build index 2cfd53f..07ea652 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -5,7 +5,7 @@ QuickStart: $ make This will check all of your prerequisites and tell you what you need to - do to get started. + do to get started to build the stable TBB. If everything checks out OK, it will begin downloading dependencies, and then start the build process to produce localized Linux bundles, followed by @@ -37,12 +37,16 @@ Detailed Explanation of Scripts: several helper scripts to make things easier. 0. Makefile: The main Makefile. It has six main commands: - - prep: Check OS prerequisites and download source dependency inputs - - build: Build localized bundles for Linux, Windows, and Mac - - clean: Remove prior partial build stages (Tor and Firefox) - - vmclean: Remove VM base images - - distclean: Remove source dependency inputs, and run clean and vmclean - - all: The default. It calls clean, prep, and then build. + - prep: Check OS prerequisites and download source dependency inputs + - build: Build localized bundles for Linux, Windows, and Mac + - clean: Remove prior partial build stages (Tor and Firefox) + - vmclean: Remove VM base images + - distclean: Remove source dependency inputs, and run clean and vmclean + - all: The default. It calls clean, prep, and then build. + To build alpha bundles, alternate targets are provided: + - alpha: The equivalent to the 'all' rule for alpha packages + - build-alpha: The equivalent to the 'build' rule for alpha packages + - prep-alpha: The equivalent to the 'prep' rule for alpha packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 2d345ce..7320c74 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -13,18 +13,18 @@ if ! [ -e ./versions ]; then exit 1 fi -. ./versions - WRAPPER_DIR=$(dirname "$0") WRAPPER_DIR=$(readlink -f "$WRAPPER_DIR") -if [ "$#" -gt 1 ]; then - echo >&2 "Usage: $0 [<inputsdir>]" - exit 1 -elif [ "$#" = 1 ]; then +if [ "$#" = 1 ]; then INPUTS_DIR="$1" -else + . ./versions +elif [ "$#" = 2 ]; then INPUTS_DIR="$PWD/../../gitian-builder/inputs" + . $2 +else + echo >&2 "Usage: $0 [<inputsdir> <versions>]" + exit 1 fi mkdir -p "$INPUTS_DIR" @@ -180,9 +180,11 @@ do fi done -mkdir -p linux-langpacks -mkdir -p win32-langpacks -mkdir -p mac-langpacks +mkdir -p langpacks-$FIREFOX_LANG_VER/linux-langpacks +mkdir -p langpacks-$FIREFOX_LANG_VER/win32-langpacks +mkdir -p langpacks-$FIREFOX_LANG_VER/mac-langpacks + +cd langpacks-$FIREFOX_LANG_VER for i in $BUNDLE_LOCALES do @@ -197,9 +199,11 @@ do cd .. done -"$WRAPPER_DIR/build-helpers/dzip.sh" win32-langpacks.zip win32-langpacks -"$WRAPPER_DIR/build-helpers/dzip.sh" linux-langpacks.zip linux-langpacks -"$WRAPPER_DIR/build-helpers/dzip.sh" mac-langpacks.zip mac-langpacks +"$WRAPPER_DIR/build-helpers/dzip.sh" ../win32-langpacks.zip win32-langpacks +"$WRAPPER_DIR/build-helpers/dzip.sh" ../linux-langpacks.zip linux-langpacks +"$WRAPPER_DIR/build-helpers/dzip.sh" ../mac-langpacks.zip mac-langpacks + +cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$PDFJS_PACKAGE" uriloader(a)pdf.js.xpi diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index e4bb857..09cbdd4 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -3,7 +3,12 @@ # This is a simple wrapper script to call out to gitian and assemble # a bundle based on gitian's output. -. ./versions +if [ -z "$1" ]; +then + . ./versions +else + . $1 +fi WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 68b7786..97d9535 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -3,7 +3,12 @@ # This is a simple wrapper script to call out to gitian and assemble # a bundle based on gitian's output. -. ./versions +if [ -z "$1" ]; +then + . ./versions +else + . $1 +fi WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 92ac0c9..a542099 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -3,7 +3,12 @@ # This is a simple wrapper script to call out to gitian and assemble # a bundle based on gitian's output. -. ./versions +if [ -z "$1" ]; +then + . ./versions +else + . $1 +fi WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder diff --git a/gitian/versions.alpha b/gitian/versions.alpha new file mode 100755 index 0000000..83d6b5d --- /dev/null +++ b/gitian/versions.alpha @@ -0,0 +1,49 @@ +TORBROWSER_VERSION=3.5-alpha-1 +BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" + +VERIFY_TAGS=0 + +TORBROWSER_TAG=tor-browser-24.1.0esr-1 +TOR_TAG=tor-0.2.4.17-rc +TORLAUNCHER_TAG=0.2.3.1-beta +TORBUTTON_TAG=1.6.4 +HTTPSE_TAG=3.4.2 +NSIS_TAG=v0.1 +ZLIB_TAG=v1.2.8 +LIBEVENT_TAG=release-2.0.21-stable +MINGW_REV=5830 + +GITIAN_TAG=tor-browser-builder-3.0-4 + +OPENSSL_VER=1.0.1e +FIREFOX_LANG_VER=24.1.0esr +BINUTILS_VER=2.22 +GCC_VER=4.6.3 + +## 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 +MSVCR100_PACKAGE=msvcr100.dll +BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 +GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 + +# Hashes for packages with weak sigs or no sigs +OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f +PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b +MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b +MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 + +## Non-git package URLs +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACKAGE} +OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} +BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} +GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 06 Nov '13

06 Nov '13

commit 5e4af4e6b9db0d10875fc0d93aaa3fd1c5646aeb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 22:16:15 2013 +0000 Update translations for tails-misc_completed --- de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.po b/de.po index efb8ee3..314da61 100644 --- a/de.po +++ b/de.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-26 23:41+0200\n" -"PO-Revision-Date: 2013-11-06 21:44+0000\n" +"PO-Revision-Date: 2013-11-06 21:50+0000\n" "Last-Translator: ivl1705 <listmember(a)rinnberger.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Nov '13

06 Nov '13

commit ce22ef86afc64b734883fc4f24445bbfe9b8b212 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 22:16:13 2013 +0000 Update translations for tails-misc --- de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.po b/de.po index efb8ee3..314da61 100644 --- a/de.po +++ b/de.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-26 23:41+0200\n" -"PO-Revision-Date: 2013-11-06 21:44+0000\n" +"PO-Revision-Date: 2013-11-06 21:50+0000\n" "Last-Translator: ivl1705 <listmember(a)rinnberger.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

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

06 Nov '13

commit 04dfa1835033d3550fb66b595d296653d3138331 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 22:15:54 2013 +0000 Update translations for liveusb-creator --- de/de.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/de/de.po b/de/de.po index fbe241c..5d7b505 100644 --- a/de/de.po +++ b/de/de.po @@ -8,6 +8,7 @@ # turbedi <thetoerk(a)gmail.com>, 2013 # Rutz <rutz90(a)gmx.de>, 2013 # tbull <tbull(a)fedoraproject.org>, 2009 +# ivl1705 <listmember(a)rinnberger.de>, 2013 # Marcus Nitzschke <marcusni(a)gmx.de>, 2008 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 # matsa <matsa(a)riseup.net>, 2012 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-06 09:28+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-06 22:10+0000\n" +"Last-Translator: ivl1705 <listmember(a)rinnberger.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "" #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 #, python-format msgid "%(distribution)s installer" -msgstr "" +msgstr "%(distribution)s Installer" #: ../liveusb/gui.py:803 #, python-format @@ -42,7 +43,7 @@ msgstr "%(filename)s ausgewählt" #: ../liveusb/gui.py:440 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" #: ../liveusb/creator.py:1020 #, python-format @@ -56,7 +57,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">⏎\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">⏎\np, li { white-space: pre-wrap; }⏎\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">⏎\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Du brauchst Hilfe? Lies die </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.de.html\"><span style=\" text-decoration: underline; color:#0000ff;\">Dokumentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -65,7 +66,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">⏎\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">⏎\np, li { white-space: pre-wrap; }⏎\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">⏎\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiere das gestartete Tails auf einen USB Stick oder SD Karte. Alle Daten auf dem Ziellaufwerk werden gelöscht.</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -74,7 +75,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">⏎\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">⏎\np, li { white-space: pre-wrap; }⏎\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">⏎\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiere das gestartete Tails auf ein bereits installiertes Tails Gerät. Andere Partitionen auf dem Stick bleiben erhalten.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -83,7 +84,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">⏎\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">⏎\np, li { white-space: pre-wrap; }⏎\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">⏎\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Ein bereits installiertes Tails Gerät von einem neuen ISO image upgraden.</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -188,7 +189,7 @@ msgstr "Fehler: Die SHA1-Prüfsumme Ihrer Live CD ist ungültig. Sie können die #: ../liveusb/creator.py:145 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "Extrahiere Live-Abbild auf das Zielgerät" #: ../liveusb/creator.py:1063 #, python-format @@ -285,7 +286,7 @@ msgstr "Persistenter Speicher (0 MB)" #: ../liveusb/gui.py:697 ../liveusb/gui.py:726 msgid "Please confirm your device selection" -msgstr "" +msgstr "Bitte bestätige deine Geräteauswahl" #: ../liveusb/gui.py:462 msgid "Refreshing releases..." @@ -389,7 +390,7 @@ msgstr "Dies ist die Status-Konsole, wo alle Nachrichten hingeschrieben werden." #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." -msgstr "" +msgstr "Versuche trotzdem fortzufahren." #: ../liveusb/creator.py:911 #, python-format @@ -412,7 +413,7 @@ msgstr "Kein USB-Laufwerk gefunden" #: ../liveusb/creator.py:1200 msgid "Unable to find any supported device" -msgstr "" +msgstr "Kann kein unterstütztes Gerät finden" #: ../liveusb/creator.py:1040 msgid "Unable to find partition" @@ -489,7 +490,7 @@ msgstr "%(device)s wird ausgehängt" #: ../liveusb/creator.py:876 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "" +msgstr "Nichtunterstütztes Gerät '%(device)s', bitte melde einen Bug." #: ../liveusb/creator.py:770 ../liveusb/creator.py:893 #, python-format

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 06 Nov '13

06 Nov '13

commit 92e78f264b45d021a06dd2263b793ee4102b9f44 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:46:15 2013 +0000 Update translations for tails-misc_completed --- de.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/de.po b/de.po index 755da25..efb8ee3 100644 --- a/de.po +++ b/de.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ivl1705 <listmember(a)rinnberger.de>, 2013 # skps <lmaerz(a)emailn.de>, 2013 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-09-09 12:35+0200\n" -"PO-Revision-Date: 2013-10-01 16:22+0000\n" -"Last-Translator: skps <lmaerz(a)emailn.de>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-26 23:41+0200\n" +"PO-Revision-Date: 2013-11-06 21:44+0000\n" +"Last-Translator: ivl1705 <listmember(a)rinnberger.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,21 +227,21 @@ msgstr "Baue Informationen:\n%s" msgid "About Tails" msgstr "Über Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" msgstr "Ihre zusätzliche Software" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "Das Upgrade ist fehlgeschlagen. Es könnte an einem Netzwerk-Problem liegen. Bitte überprüfen Sie ihre Netzwerkverbindung, starten Sie Tails neu oder lesen Sie die System-Logdateien um das Problem zu finden." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 msgid "The upgrade was successful." msgstr "Das Upgrade war erfolgreich." @@ -405,9 +406,9 @@ msgid "" "concerns." msgstr "TrueCrypt wird bald von Tails entfernt, da es Lizensierungs-Probleme und Sorgen um die Entwicklung gibt." -#: ../config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop.in.h:1 -msgid "Report a Bug" -msgstr "Einen Bug melden" +#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 +msgid "Report an error" +msgstr "Einen Fehler melden" #: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 msgid "Tails documentation"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Nov '13

06 Nov '13

commit 1ce9fd602213591dcb46b8ff5529e9244fa52606 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:46:12 2013 +0000 Update translations for tails-misc --- de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index b568f0b..efb8ee3 100644 --- a/de.po +++ b/de.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ivl1705 <listmember(a)rinnberger.de>, 2013 # skps <lmaerz(a)emailn.de>, 2013 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-26 23:41+0200\n" -"PO-Revision-Date: 2013-11-06 09:01+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-06 21:44+0000\n" +"Last-Translator: ivl1705 <listmember(a)rinnberger.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -407,7 +408,7 @@ msgstr "TrueCrypt wird bald von Tails entfernt, da es Lizensierungs-Probleme und #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" -msgstr "" +msgstr "Einen Fehler melden" #: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 msgid "Tails documentation"

1 0

[flashproxy/master] factor out certificate checking and pinning into flashproxy.keys
by infinity0＠torproject.org 06 Nov '13

06 Nov '13

commit 1e541947c32f8d390b5df1cc1c42928e7c058dd5 Author: Ximin Luo <infinity0(a)gmx.com> Date: Wed Nov 6 17:32:21 2013 +0000 factor out certificate checking and pinning into flashproxy.keys --- Makefile | 2 +- flashproxy-reg-appspot | 25 ++++--------------------- flashproxy-reg-email | 31 ++++--------------------------- flashproxy/keys.py | 31 +++++++++++++++++++++++++++++++ flashproxy/test/test_keys.py | 22 ++++++++++++++++++++++ setup-common.py | 3 ++- 6 files changed, 64 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 2429f33..5623c4f 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ distclean: test: check check: $(MAKE_CLIENT) check - $(PYTHON) setup-common.py check + $(PYTHON) setup-common.py test cd facilitator && ./facilitator-test cd proxy && ./flashproxy-test.js diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index c47579c..a261f10 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -13,9 +13,8 @@ import tempfile import urlparse import urllib2 -from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1 +from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1, check_certificate_pin, temp_cert from flashproxy.util import parse_addr_spec, format_addr -from hashlib import sha1 try: from M2Crypto import SSL, X509 @@ -142,31 +141,15 @@ class PinHTTPSConnection(httplib.HTTPSConnection): ctx = SSL.Context("tlsv1") ctx.set_verify(SSL.verify_peer, 3) - ca_certs_fd, ca_certs_path = tempfile.mkstemp(prefix="flashproxy-reg-appspot-", - dir=get_state_dir(), suffix=".crt") - try: - os.write(ca_certs_fd, PIN_GOOGLE_CERT) - os.close(ca_certs_fd) - ret = ctx.load_verify_locations(ca_certs_path) + with temp_cert(PIN_GOOGLE_CERT) as ca_file: + ret = ctx.load_verify_locations(ca_file.name) assert ret == 1 - finally: - os.unlink(ca_certs_path) self.sock = SSL.Connection(ctx, sock) self.sock.connect((self.host, self.port)) if options.use_certificate_pin: - found = [] - for cert in self.sock.get_peer_cert_chain(): - pubkey_der = cert.get_pubkey().as_der() - pubkey_digest = sha1(pubkey_der).digest() - if pubkey_digest in PIN_GOOGLE_PUBKEY_SHA1: - break - found.append(pubkey_digest) - else: - found = "(" + ", ".join(x.encode("hex") for x in found) + ")" - expected = "(" + ", ".join(x.encode("hex") for x in PIN_GOOGLE_PUBKEY_SHA1) + ")" - raise ValueError("Public key does not match pin: got %s but expected any of %s" % (found, expected)) + check_certificate_pin(self.sock, PIN_GOOGLE_PUBKEY_SHA1) class PinHTTPSHandler(urllib2.HTTPSHandler): def https_open(self, req): diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 8bc8b6f..4f4599c 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -11,9 +11,8 @@ import sys import tempfile import urllib -from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1, DEFAULT_FACILITATOR_PUBKEY_PEM +from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1, DEFAULT_FACILITATOR_PUBKEY_PEM, check_certificate_pin, temp_cert from flashproxy.util import parse_addr_spec, format_addr -from hashlib import sha1 try: from M2Crypto import BIO, RSA, SSL, X509 @@ -185,11 +184,7 @@ try: ctx = SSL.Context("tlsv1") ctx.set_verify(SSL.verify_peer, 3) - ca_certs_fd, ca_certs_path = tempfile.mkstemp(prefix="flashproxy-reg-email-", - dir=get_state_dir(), suffix=".crt") - try: - os.write(ca_certs_fd, PIN_GOOGLE_CERT) - os.close(ca_certs_fd) + with temp_cert(PIN_GOOGLE_CERT) as ca_file: # We roll our own initial EHLO/STARTTLS because smtplib.SMTP.starttls # doesn't allow enough certificate validation. code, msg = smtp.docmd("EHLO", EHLO_FQDN) @@ -198,10 +193,8 @@ try: code, msg = smtp.docmd("STARTTLS") if code != 220: raise ValueError("Got code %d after STARTTLS" % code) - ret = ctx.load_verify_locations(ca_certs_path) + ret = ctx.load_verify_locations(ca_file.name) assert ret == 1 - finally: - os.unlink(ca_certs_path) smtp.sock = SSL.Connection(ctx, smtp.sock) smtp.sock.setup_ssl() @@ -210,23 +203,7 @@ try: smtp.file = smtp.sock.makefile() if options.use_certificate_pin: - found = [] - for cert in smtp.sock.get_peer_cert_chain(): - pubkey_der = cert.get_pubkey().as_der() - pubkey_digest = sha1(pubkey_der).digest() - if pubkey_digest in PIN_GOOGLE_PUBKEY_SHA1: - break - found.append(pubkey_digest) - else: - found = "(" + ", ".join(x.encode("hex") for x in found) + ")" - expected = "(" + ", ".join(x.encode("hex") for x in PIN_GOOGLE_PUBKEY_SHA1) + ")" - raise ValueError("Public key does not match pin: got %s but expected any of %s" % (found, expected)) - - if options.use_certificate_pin and pubkey_digest not in PIN_GOOGLE_PUBKEY_SHA1: - expected = "(" + ", ".join(x.encode("hex") for x in PIN_GOOGLE_PUBKEY_SHA1) + ")" - raise ValueError("Public key does not match pin: got %s but expected any of %s" % - (pubkey_digest.encode("hex"), expected)) - + check_certificate_pin(smtp.sock, PIN_GOOGLE_PUBKEY_SHA1) smtp.ehlo(EHLO_FQDN) if not options.remote_addr[0]: diff --git a/flashproxy/keys.py b/flashproxy/keys.py index 71525c8..5b4b9fa 100644 --- a/flashproxy/keys.py +++ b/flashproxy/keys.py @@ -1,3 +1,7 @@ +import tempfile + +from hashlib import sha1 + # We trust no other CA certificate than this. # # To find the certificate to copy here, @@ -52,3 +56,30 @@ M5SDDYYY4xxEPzokjFJfCQv+kcyAnzERNMQ9kR41ePTXG62bpngK5iWGeJ5XdkxG gwIDAQAB -----END PUBLIC KEY----- """ + +def check_certificate_pin(sock, cert_pubkey): + found = [] + for cert in sock.get_peer_cert_chain(): + pubkey_der = cert.get_pubkey().as_der() + pubkey_digest = sha1(pubkey_der).digest() + if pubkey_digest in cert_pubkey: + break + found.append(pubkey_digest) + else: + found = "(" + ", ".join(x.encode("hex") for x in found) + ")" + expected = "(" + ", ".join(x.encode("hex") for x in cert_pubkey) + ")" + raise ValueError("Public key does not match pin: got %s but expected any of %s" % (found, expected)) + +class temp_cert(object): + """Implements a with-statement over raw certificate data.""" + + def __init__(self, certdata): + self.fd = tempfile.NamedTemporaryFile(prefix="fp-cert-temp-", suffix=".crt", delete=True) + self.fd.write(certdata) + self.fd.flush() + + def __enter__(self): + return self.fd + + def __exit__(self, type, value, traceback): + self.fd.close() diff --git a/flashproxy/test/__init__.py b/flashproxy/test/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/flashproxy/test/test_keys.py b/flashproxy/test/test_keys.py new file mode 100644 index 0000000..de22279 --- /dev/null +++ b/flashproxy/test/test_keys.py @@ -0,0 +1,22 @@ +import os.path +import unittest + +from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1, DEFAULT_FACILITATOR_PUBKEY_PEM, check_certificate_pin, temp_cert + +class TempCertTest(unittest.TestCase): + def test_temp_cert_success(self): + fn = None + with temp_cert(PIN_GOOGLE_CERT) as ca_file: + fn = ca_file.name + self.assertTrue(os.path.exists(fn)) + self.assertFalse(os.path.exists(fn)) + + def test_temp_cert_raise(self): + fn = None + try: + with temp_cert(PIN_GOOGLE_CERT) as ca_file: + fn = ca_file.name + raise ValueError() + self.fail() + except ValueError: + self.assertFalse(os.path.exists(fn)) diff --git a/setup-common.py b/setup-common.py index 5d98fd9..97d2099 100755 --- a/setup-common.py +++ b/setup-common.py @@ -32,7 +32,8 @@ setup( license = "BSD", keywords = ['tor', 'flashproxy'], - packages = find_packages(), + packages = find_packages(exclude=['*.test']), + test_suite='flashproxy.test', version = "1.4",

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Nov '13

06 Nov '13

commit 5bba85b56e336a925c5d184eca9840fd45977afd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 20:46:17 2013 +0000 Update translations for tails-misc --- pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pl.po b/pl.po index a1884df..74a5616 100644 --- a/pl.po +++ b/pl.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-26 23:41+0200\n" -"PO-Revision-Date: 2013-11-06 09:01+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-06 20:20+0000\n" +"Last-Translator: sebx\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "<h1>Pomóż nam naprawić błąd!</h1>⏎ <p>Przeczytaj <a href=\"%s\">instrukcje jak zgłaszać błędy</a>.</p>⏎ <p><strong>Nie ujawniaj więcej informacji o sobie niż to \nkonieczne!</strong></p>⏎ <h2>Jeżeli chcesz podać adres email</h2>\n<p>Jeżeli zgadzasz się na częściowe ujawnienie swojej tożsamości\ndeweloperom Tails, możesz podać swój adres email\nżebyśmy mogli zadać Ci dodatkowe pytania dotyczące błędu. Ponadto, jeżeli podasz\nklucz publiczny PGP umożliwisz nam szyfrowanie tego typu \nkomunikacji.</p>\n<p>Każdy kto zobaczy tą odpowiedź domyśli się, że jesteś\nużytkownikiem Tails. Czas aby się zastanowić jak bardzo ufasz swoim dostawcom\ninternetu i poczty.</p>\n" +msgstr "<h1>Pomóż naprawić nam błąd!</h1>⏎ <p>Przeczytaj <a href=\"%s\">instrukcje jak zgłaszać błędy</a>.</p>⏎ <p><strong>Nie ujawniaj więcej informacji o sobie niż to \nkonieczne!</strong></p>⏎ <h2>Jeżeli chcesz podać swój adres email</h2>\n<p>Jeżeli zgadzasz się na częściowe ujawnienie swojej tożsamości\ndeweloperom Tails, możesz podać swój adres email\nżebyśmy mogli zadać Ci dodatkowe pytania dotyczące błędu z którym się spotkałeś. Ponadto, jeżeli podasz\nklucz publiczny PGP umożliwisz nam szyfrowanie tego typu \nkomunikacji.</p>\n<p>Każdy kto zobaczy tą odpowiedź domyśli się, że jesteś\nużytkownikiem Tails. Czas aby się zastanowić jak bardzo ufasz swoim dostawcom\ninternetu i poczty.</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 06 Nov '13

06 Nov '13

commit 354eee762d2bba98dcbd893343b38f8e928831a9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 20:46:02 2013 +0000 Update translations for tails-persistence-setup_completed --- pl/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/pl.po b/pl/pl.po index 5e9ff5d..ffb9b96 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2013-10-26 23:24+0200\n" -"PO-Revision-Date: 2013-11-06 20:13+0000\n" +"PO-Revision-Date: 2013-11-06 20:20+0000\n" "Last-Translator: sebx\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n"

1 0