- tor-commits - lists.torproject.org

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 44624746225246d6bfe7e7ce8ecc368a1bad4007 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 14:46:45 2016 +0000 Update translations for tor-messenger-privproperties_completed --- tr/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/tr/priv.properties b/tr/priv.properties index fe4f340..1caf0e6 100644 --- a/tr/priv.properties +++ b/tr/priv.properties @@ -1 +1,2 @@ priv.account=%S (%S) için kişisel anahtar oluşturuluyor ... +priv.failed=Anahtar oluşturulamadı: %S

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 0cae2b0d5e509f984ad728ee1b6dcd5caf5ea524 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 14:45:38 2016 +0000 Update translations for mat-gui_completed --- tr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tr.po b/tr.po index 63948d5..fcaebaa 100644 --- a/tr.po +++ b/tr.po @@ -4,7 +4,7 @@ # # Translators: # Güven ALBAYRAK <inactive+guvenalbayrak52(a)transifex.com>, 2014 -# Kaya Zeren <kayazeren(a)gmail.com>, 2015 +# Kaya Zeren <kayazeren(a)gmail.com>, 2015-2016 # Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015 # Volkan Gezer <volkangezer(a)gmail.com>, 2015-2016 # Yasin Özel <iletisim(a)yasinozel.com.tr>, 2013 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-03 20:54+0100\n" -"PO-Revision-Date: 2016-01-07 20:07+0000\n" -"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-11 14:25+0000\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,12 +77,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "Oluşturulan PDF dosyasının boyutunu ve kalitesini düşür" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "Desteklenmeyen dosyaları arşive ekle" +msgid "Remove unsupported file from archives" +msgstr "Desteklenmeyen dosyaları arşivden çıkar" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Desteklenmeyen (ve anonimleştirilmemiş) dosyaları çıkış arşivine ekle" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Desteklenmeyen (ve anonim olmayan) dosyaları çıkış arşivinden çıkar" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 0dea2bb9df348aa738b990913bc097e90bd176b9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 14:45:33 2016 +0000 Update translations for mat-gui --- tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tr.po b/tr.po index 8d49601..fcaebaa 100644 --- a/tr.po +++ b/tr.po @@ -4,7 +4,7 @@ # # Translators: # Güven ALBAYRAK <inactive+guvenalbayrak52(a)transifex.com>, 2014 -# Kaya Zeren <kayazeren(a)gmail.com>, 2015 +# Kaya Zeren <kayazeren(a)gmail.com>, 2015-2016 # Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015 # Volkan Gezer <volkangezer(a)gmail.com>, 2015-2016 # Yasin Özel <iletisim(a)yasinozel.com.tr>, 2013 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-11 14:25+0000\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,11 +78,11 @@ msgstr "Oluşturulan PDF dosyasının boyutunu ve kalitesini düşür" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Desteklenmeyen dosyaları arşivden çıkar" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Desteklenmeyen (ve anonim olmayan) dosyaları çıkış arşivinden çıkar" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit feecc153f98e2ed608a84068359f48673c4a3358 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 13:15:37 2016 +0000 Update translations for mat-gui_completed --- zh_CN.po | 134 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index edc5c3b..bd783f5 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -4,13 +4,13 @@ # # Translators: # khi, 2013 -# YF <yfdyh000(a)gmail.com>, 2014-2015 +# YF <yfdyh000(a)gmail.com>, 2014-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 15:03+0100\n" -"PO-Revision-Date: 2015-12-17 23:53+0000\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-11 13:07+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -19,171 +19,171 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mat-gui:64 mat-gui:415 mat-gui:438 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "准备" -#: mat-gui:133 +#: mat-gui:136 msgid "Choose files" msgstr "选择文件" -#: mat-gui:141 -msgid "All files" -msgstr "全部文件" - -#: mat-gui:147 +#: mat-gui:144 msgid "Supported files" msgstr "支持文件" -#: mat-gui:164 mat-gui:359 mat-gui:410 mat-gui:434 mat-gui:436 -#: data/mat.glade:480 +#: mat-gui:151 +msgid "All files" +msgstr "全部文件" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "清除" -#: mat-gui:165 +#: mat-gui:168 msgid "No metadata found" msgstr "未找到元数据" -#: mat-gui:167 mat-gui:412 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "更新" -#: mat-gui:172 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "%s 的元数据" -#: mat-gui:183 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "丢弃元标签，保留数据" -#: mat-gui:188 +#: mat-gui:192 msgid "Website" msgstr "网站" -#: mat-gui:214 +#: mat-gui:219 msgid "Preferences" msgstr "首选项" -#: mat-gui:227 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "降低 PDF 质量" -#: mat-gui:230 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "降低生成 PDF 的大小和质量" -#: mat-gui:233 -msgid "Add unsupported file to archives" -msgstr "将不支持的文件添加到存档" +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "从存档中移除不支持的文件" -#: mat-gui:236 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "将不支持（与非匿名化）的文件添加到输出存档" +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "从输出存档中移除不支持（与非匿名化）的文件" -#: mat-gui:275 +#: mat-gui:280 msgid "Unknown" msgstr "未知" -#: mat-gui:318 +#: mat-gui:325 msgid "Not-supported" msgstr "不支持" -#: mat-gui:332 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "无害的文件格式" -#: mat-gui:334 +#: mat-gui:341 msgid "Cant read file" msgstr "无法读取文件" -#: mat-gui:336 +#: mat-gui:343 msgid "Fileformat not supported" msgstr "不支持的文件格式" -#: mat-gui:339 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "这些文件不能被处理:" -#: mat-gui:344 mat-gui:373 data/mat.glade:519 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "文件名" -#: mat-gui:346 +#: mat-gui:353 msgid "Reason" msgstr "原因" -#: mat-gui:358 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "不支持压缩包内的文件" -#: mat-gui:372 +#: mat-gui:379 msgid "Include" msgstr "包括" -#: mat-gui:390 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT 不能清除下列文件，发现于 %s 压缩文件" -#: mat-gui:406 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "正在检查 %s" -#: mat-gui:421 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "正在清除 %s" -#: data/mat.glade:26 data/mat.glade:196 +#: data/mat.glade:46 +msgid "_File" +msgstr "文件(_F)" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "编辑(_E)" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "帮助(_H)" + +#: data/mat.glade:187 +msgid "Add" +msgstr "添加" + +#: data/mat.glade:256 +msgid "State" +msgstr "状态" + +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "元数据" -#: data/mat.glade:85 +#: data/mat.glade:354 msgid "Name" msgstr "名字" -#: data/mat.glade:99 +#: data/mat.glade:368 msgid "Content" msgstr "内容" -#: data/mat.glade:129 +#: data/mat.glade:398 msgid "Supported formats" msgstr "支持格式" -#: data/mat.glade:185 +#: data/mat.glade:456 msgid "Support" msgstr "支持" -#: data/mat.glade:207 +#: data/mat.glade:478 msgid "Method" msgstr "方式" -#: data/mat.glade:218 +#: data/mat.glade:489 msgid "Remaining" msgstr "剩余" -#: data/mat.glade:247 +#: data/mat.glade:518 msgid "Fileformat" msgstr "文件格式" - -#: data/mat.glade:326 -msgid "_File" -msgstr "文件(_F)" - -#: data/mat.glade:375 -msgid "_Edit" -msgstr "编辑(_E)" - -#: data/mat.glade:421 -msgid "_Help" -msgstr "帮助(_H)" - -#: data/mat.glade:467 -msgid "Add" -msgstr "添加" - -#: data/mat.glade:536 -msgid "State" -msgstr "状态"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 4089bb590ce182f2cf1fc4d38424707023c67333 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 13:15:32 2016 +0000 Update translations for mat-gui --- zh_CN.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index d55307c..bd783f5 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -4,14 +4,14 @@ # # Translators: # khi, 2013 -# YF <yfdyh000(a)gmail.com>, 2014-2015 +# YF <yfdyh000(a)gmail.com>, 2014-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-11 13:07+0000\n" +"Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,11 @@ msgstr "降低生成 PDF 的大小和质量" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "从存档中移除不支持的文件" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "从输出存档中移除不支持（与非匿名化）的文件" #: mat-gui:280 msgid "Unknown"

1 0

[tor-browser-bundle/hardened-builds] Revert "Revert "Bug 15578: Switch Linux descriptors over to Wheezy""
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit b429deeb6d6cd749d11855cfec058e168cddfc3c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 13:04:11 2016 +0000 Revert "Revert "Bug 15578: Switch Linux descriptors over to Wheezy"" This reverts commit a125e1c1bfc3babae9636750b4722b4ab7010ca3. --- gitian/Makefile | 2 +- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 41 +++++++++++----------- gitian/descriptors/linux/gitian-bundle.yml | 6 ++-- gitian/descriptors/linux/gitian-firefox.yml | 9 +++-- .../linux/gitian-pluggable-transports.yml | 7 ++-- gitian/descriptors/linux/gitian-tor.yml | 7 ++-- gitian/descriptors/linux/gitian-utils.yml | 38 +++++++++++++++----- gitian/make-vms.sh | 29 +++++++++------ 9 files changed, 84 insertions(+), 57 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 5718d76..36b5ec3 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -119,7 +119,7 @@ clean-bundle: vmclean: rm -rf ../../gitian-builder/*.qcow2 rm -rf ../../gitian-builder/base-* - rm -rf ../../gitian-builder/target-{lucid,precise}* + rm -rf ../../gitian-builder/target-{lucid,wheezy,precise}* distclean: vmclean rm -rf ../../gitian-builder/inputs/* diff --git a/gitian/README.build b/gitian/README.build index f289791..4d01d6a 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -177,7 +177,7 @@ Known Issues and Quirks: where 'make vmclean' causes the rebuild of two VMs in a row.. This might trigger weird bugs in python-vm-builder.. To rebuild only one set of VMs, use either 'rm ../../gitian-builder/*precise*' (to remove the Windows/Mac - VMs) or 'rm ../../gitian-builder/*lucid*' (to remove the Linux VMs). + VMs) or 'rm ../../gitian-builder/*wheezy*' (to remove the Linux VMs). You probably want to make sure you have no stray qemu processes before rebuilding the VMs or starting a new build, too. 'killall qemu-kvm' is diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index cc16d0e..a5f8393 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` if [ "$VERSION" -ge "14" ]; then - dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" exit 1 fi else @@ -45,28 +45,29 @@ then echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip python-cheetah debootstrap parted kpartx rsync" exit 1 fi - - # python-vm-builder is special as we don't have a Debian package for it. - vmbuilder --help 2>/dev/null >/dev/null - if [ $? -ne 0 ]; - then - echo "The VM tool python-vm-builder is missing." - echo - echo "Please run" - echo 'torsocks wget -U "" http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12…' - echo 'echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c' - echo "# (verification -- must return OK)" - echo "tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz" - echo "cd vm-builder-0.12.4+bzr489" - echo "sudo python setup.py install" - echo "cd .." - exit 1 - fi else echo "We need Debian or Ubuntu which seem to be missing. Aborting." exit 1 fi +# vmbuilder is special as we don't have a package for it yet. +# XXX: Make sure an already installed vmbuilder is recent enough. +vmbuilder --help 2>/dev/null >/dev/null +if [ $? -ne 0 ]; +then + echo "The VM tool python-vm-builder is missing." + echo + echo "Please run" + echo 'torsocks wget -U "" https://bugs.launchpad.net/ubuntu/+archive/primary/+files/vm-builder_0.12.4…' + echo 'echo "76cbf8c52c391160b2641e7120dbade5afded713afaa6032f733a261f13e6a8e vm-builder_0.12.4+bzr494.orig.tar.gz" | sha256sum -c' + echo "# (verification -- must return OK)" + echo "tar -zxvf vm-builder_0.12.4+bzr494.orig.tar.gz" + echo "cd vm-builder-0.12.4+bzr494" + echo "sudo python setup.py install" + echo "cd .." + exit 1 +fi + update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg @@ -80,7 +81,7 @@ if [ -n "$missing_pkg" ] then echo "You are missing one or more dependencies for the update_responses script" echo "Please run" - echo " sudo apt-get install $missing_pkg" + echo " sudo torsocks apt-get install $missing_pkg" exit 1 fi diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 7629b4f..a9a0e36 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -1,7 +1,8 @@ --- name: "bundle-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -107,9 +108,6 @@ script: | cd ../../../ # cd https-everywhere - # Workaround for git not knowing `git submodule -f` in the version shipped in - # 10.04. - sed 's/recursive -f/recursive/' -i makexpi.sh # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 # The solution there does not work for us as doing something like diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3c6c1f1..a0fc8e3 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -1,7 +1,8 @@ --- name: "torbrowser-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -10,9 +11,10 @@ packages: - "autoconf2.13" - "libgtk2.0-dev" - "libdbus-glib-1-dev" -- "yasm-1" +- "yasm" - "libasound2-dev" - "libgstreamer-plugins-base0.10-dev" +- "libxt-dev" - "hardening-wrapper" # To pass configure since ESR 31. - "libpulse-dev" @@ -45,9 +47,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - mkdir -p $INSTDIR/build/bin/ - ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm - export PATH=$PATH:$INSTDIR/build/bin # Preparing Python for Tor Browser unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip # TODO: We might want to have a smarter solution than hard-coding the version. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 25b5a1b..a886572 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -1,7 +1,8 @@ --- name: "pluggable-transports-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -54,7 +55,6 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -248,7 +248,8 @@ script: | cp -a obfs4proxy $PTDIR cd ../.. - # Grabbing the results + # Grabbing the results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 cd $INSTDIR ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 630c2e0..f8f83e9 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -1,7 +1,8 @@ --- name: "tor-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -27,7 +28,6 @@ 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 @@ -90,7 +90,8 @@ script: | objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - # Grabbing the results + # Grabbing the results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/ ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 1e3102f..1e04b36 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -1,7 +1,8 @@ --- name: "utils-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -21,6 +22,8 @@ packages: - "libxslt-dev" # Needed for passing the Python related part of configure in ESR 31. - "libssl-dev" +# Needed for binutils (64bit) as we are building with PIE enabled. +- "libstdc++6-4.7-pic" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -40,6 +43,7 @@ script: | source versions export TZ=UTC export LC_ALL=C + export FAKETIME=$REFERENCE_DATETIME umask 0022 # Config options for hardening-wrapper @@ -51,6 +55,14 @@ script: | # Building Binutils tar xjf binutils.tar.bz2 + # The libstdc++ shipped by default is non-PIC which breaks the binutils build + # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND + # make sure it gets used before the non-PIC one would. + if [ $GBUILD_BITS == "64" ]; + then + ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a + export LDFLAGS="-L/home/debian -lstdc++" + fi cd binutils* # We want to use gold as the linker in our toolchain mainly as it is way # faster when linking Tor Browser code (especially libxul). But apart from @@ -61,6 +73,15 @@ script: | make install cd .. + export LDFLAGS="" + # We need to disable `-Werror=format-security` as GCC does not build with it + # anymore. It seems it got audited for those problems already: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. + export DEB_BUILD_HARDENING_FORMAT=0 + # libfaketime gets into our way when building GCC 4.9.x. See: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we + # avoid it for the toolchain and cross our fingers. + # TODO: Test a newer libfaketime than 0.8. # Building GCC tar xjf gcc.tar.bz2 cd gcc-* @@ -70,13 +91,7 @@ script: | make install cd .. - # libfaketime gets into our way when building GCC 4.9.x. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we - # avoid it for the toolchain and cross our fingers. - # TODO: Test a newer libfaketime than 0.8. - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME - + export DEB_BUILD_HARDENING_FORMAT=1 # Building Libevent cd libevent ./autogen.sh @@ -87,6 +102,7 @@ script: | cd .. # Building OpenSSL + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 tar xzf openssl.tar.gz cd openssl-* find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" @@ -107,6 +123,7 @@ script: | cd .. # Building lxml + export LD_PRELOAD="" tar xzf lxml.tar.gz cd lxml-* # Make sure we use our freshly built python binary here. Otherwise bad things @@ -114,7 +131,9 @@ script: | # rules. $INSTDIR/python/bin/python2.7 setup.py build cd build/lib* + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml + export LD_PRELOAD="" cp *utils.zip $OUTDIR cd ../../../ @@ -131,7 +150,8 @@ script: | make install cd .. - # Grabbing the remaining results + # Grabbing the remaining results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 cd $INSTDIR ~/build/dzip.sh binutils-$BINUTILS_VER-linux$GBUILD_BITS-utils.zip binutils ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index a3b43b5..469a9ca 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -33,7 +33,14 @@ build_and_test_vm() { export LXC_ARCH=$arch ./bin/make-base-vm --suite $dist --lxc --arch $arch else - ./bin/make-base-vm --suite $dist --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --arch $arch + fi fi make-clean-vm --suite $dist --arch $arch @@ -56,21 +63,21 @@ build_and_test_vm() { return 0 } -while ! build_and_test_vm lucid i386 32 +while ! build_and_test_vm wheezy i386 32 do - stop-target 32 lucid - rm ./base-lucid-i386* + stop-target 32 wheezy + rm ./base-wheezy-i386* echo - echo "Lucid i386 VM build failed... Trying again" + echo "Wheezy i386 VM build failed... Trying again" echo done -while ! build_and_test_vm lucid amd64 64 +while ! build_and_test_vm wheezy amd64 64 do - stop-target 64 lucid - rm ./base-lucid-amd64* + stop-target 64 wheezy + rm ./base-wheezy-amd64* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Wheezy amd64 VM build failed... Trying again" echo done @@ -79,7 +86,7 @@ do stop-target 32 precise rm ./base-precise-i386* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Precise amd64 VM build failed... Trying again" echo done @@ -88,7 +95,7 @@ do stop-target 64 precise rm ./base-precise-amd64* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Precise amd64 VM build failed... Trying again" echo done

1 0

[tor-browser-bundle/hardened-builds] Revert "Revert "Bug 15578: drop our Python build""
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit faaed5b13cce8e4701fe3deb5894432415ed9cc9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 13:04:37 2016 +0000 Revert "Revert "Bug 15578: drop our Python build"" This reverts commit 92d04ecc79e97a3306e12807af289c434be5da00. --- gitian/descriptors/linux/gitian-bundle.yml | 7 +------ gitian/descriptors/linux/gitian-firefox.yml | 7 +------ gitian/descriptors/linux/gitian-utils.yml | 25 ------------------------- gitian/fetch-inputs.sh | 7 ++----- gitian/mkbundle-linux.sh | 6 ------ gitian/verify-tags.sh | 5 ++--- gitian/versions | 5 ----- gitian/versions.alpha | 5 ----- gitian/versions.beta | 5 ----- gitian/versions.nightly | 5 ----- 10 files changed, 6 insertions(+), 71 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index a9a0e36..ea754e7 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -13,6 +13,7 @@ packages: - "libxslt1.1" - "libxml2-utils" - "sqlite3" +- "python-lxml" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -32,8 +33,6 @@ files: - "tor-browser-linux64-gbuilt.zip" - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" -- "python-linux64-utils.zip" -- "lxml-linux64-utils.zip" - "mar-tools-linux64.zip" - "torrc-defaults-appendix-linux" - "bridge_prefs.js" @@ -78,10 +77,6 @@ script: | mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ - # Preparing Python for HTTPS-Everywhere. - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - export PATH=$INSTDIR/python/bin:$PATH - unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-linux${GBUILD_BITS}.zip diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index a0fc8e3..c49636a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -16,6 +16,7 @@ packages: - "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" +- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. @@ -29,7 +30,6 @@ remotes: files: - "binutils-linux64-utils.zip" - "gcc-linux64-utils.zip" -- "python-linux64-utils.zip" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -47,11 +47,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - # Preparing Python for Tor Browser - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - # TODO: We might want to have a smarter solution than hard-coding the version. - ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python - export PATH=$INSTDIR/python/bin:$PATH # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 1e04b36..72ead1b 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,8 +32,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "python.tar.bz2" -- "lxml.tar.gz" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -113,29 +111,7 @@ script: | make install cd .. - # Building Python - # Fx 24 ESR and HTTPS Everywhere >= 3.5 do not work with Python < 2.7 anymore. - # But 10.04 does only ship with Python 2.6. Thus, we compile 2.7 ourselves... - tar xjf python.tar.bz2 - cd Python-* - ./configure - make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python - cd .. - - # Building lxml - export LD_PRELOAD="" - tar xzf lxml.tar.gz - cd lxml-* - # Make sure we use our freshly built python binary here. Otherwise bad things - # may happen when we do so in the bundle step assembling the HTTPS-Everywhere - # rules. - $INSTDIR/python/bin/python2.7 setup.py build - cd build/lib* - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml export LD_PRELOAD="" - cp *utils.zip $OUTDIR - cd ../../../ # Building GMP tar xjf gmp.tar.bz2 @@ -157,6 +133,5 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent - ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c6a401d..23410c0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,11 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -226,7 +225,6 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 -ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz @@ -236,7 +234,6 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 -ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 5fa3966..a1674dd 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -104,8 +104,6 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux64-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ - ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ - ! -f inputs/lxml-$LXML_VER-linux64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then echo @@ -125,8 +123,6 @@ then ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ @@ -141,8 +137,6 @@ else ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 77d71b0..8202df6 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -121,12 +121,11 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" diff --git a/gitian/versions b/gitian/versions index cbb9a41..d40c03c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -55,7 +55,6 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -70,7 +69,6 @@ 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 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -80,7 +78,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -120,7 +117,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… 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/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -131,7 +127,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 98881d5..ab6d062 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -56,7 +56,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -71,7 +70,6 @@ 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 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -80,7 +78,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -119,7 +116,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… 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/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -129,7 +125,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.beta b/gitian/versions.beta index 243eb40..14c08c5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -48,7 +48,6 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -63,7 +62,6 @@ 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 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -73,7 +71,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -112,7 +109,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… 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/${NO… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -123,7 +119,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 876d00b..21838bc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 @@ -74,7 +73,6 @@ 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 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -83,7 +81,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -122,7 +119,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… 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/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -132,7 +128,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a…

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit ac25916d66c75bba238fe4f7c250eb5c629ba04c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 12:15:36 2016 +0000 Update translations for mat-gui_completed --- fr_CA.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index c38f200..d93f961 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-03 20:54+0100\n" -"PO-Revision-Date: 2016-01-06 19:31+0000\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-11 12:02+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -75,12 +75,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "Réduire la taille et la qualité des PDF produits" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "Ajouter le(s) fichier(s) non pris en charge aux archives" +msgid "Remove unsupported file from archives" +msgstr "Retirer les fichiers non pris en charge des archives" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Ajouter le(s) fichier(s) non pris en charge (et donc non anonymisés) aux archives produites" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Retirer les fichiers non pris en charge (et donc non anonymisés) du fichier compressé de sortie" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 4e79bc64b1c25e86a7fefa42e5efcd29323da3fe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 12:15:32 2016 +0000 Update translations for mat-gui --- fr_CA.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 51d1480..d93f961 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-11 12:02+0000\n" +"Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +76,11 @@ msgstr "Réduire la taille et la qualité des PDF produits" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Retirer les fichiers non pris en charge des archives" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Retirer les fichiers non pris en charge (et donc non anonymisés) du fichier compressé de sortie" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 0a6e018c42744be35fbcd7581c2decb5f932f219 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 11:15:36 2016 +0000 Update translations for mat-gui_completed --- zh_TW.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 396b0bc..16903e9 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Agustín Wu <losangwuyts(a)gmail.com>, 2016 # Bobby Ho <angela.bobby(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # Wen-Gan Li <wgli(a)wgli.net>, 2015 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-03 20:54+0100\n" -"PO-Revision-Date: 2015-12-22 12:44+0000\n" -"Last-Translator: Wen-Gan Li <wgli(a)wgli.net>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-11 11:01+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,12 +77,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "減少產生的 PDF 檔案大小和品質" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "新增不支援的檔案到壓縮檔" +msgid "Remove unsupported file from archives" +msgstr "從檔案庫中移除已不被支援的檔案" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "新增未支援 (也沒有匿名的) 檔案到輸出壓縮檔" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "從輸出檔案庫中將不被支援(以及不具匿名性)的檔案移除" #: mat-gui:280 msgid "Unknown"

1 0