June 2016 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Jun '16

03 Jun '16

commit 774021af1b57e22d9bb9859c09736db20f519c00 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 3 11:15:16 2016 +0000 Update translations for https_everywhere --- es/https-everywhere.dtd | 2 +- fa/https-everywhere.dtd | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 2d6cfaf..c87be68 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "Creado por"> <!ENTITY https-everywhere.about.and ", y"> <!ENTITY https-everywhere.about.librarians "Bibliotecarios de reglas"> -<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> +<!ENTITY https-everywhere.about.add_new_rule "Añadir nueva regla"> <!ENTITY https-everywhere.about.thanks "Agradecimientos para"> <!ENTITY https-everywhere.about.many_contributors "Muchos muchos colaboradores, incluyendo"> <!ENTITY https-everywhere.about.noscript "Además, partes de HTTPS Everywhere están basadas en código de NoScript, de Giorgio Maone y otros. ¡Estamos agradecidos por su excelente trabajo!"> diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 2379fd3..75d1206 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -1,5 +1,5 @@ -<!ENTITY https-everywhere.about.title "درباره‌ی HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS همه‌جا"> +<!ENTITY https-everywhere.about.title "درباره HTTPS سراسری"> +<!ENTITY https-everywhere.about.ext_name "HTTPS سراسری"> <!ENTITY https-everywhere.about.ext_description "وب را رمزگذاری کنید! از امنیت HTTPS بصورت خودکار برای بسیاری از وب‌سایت‌ها استفاده کنید."> <!ENTITY https-everywhere.about.version "نسخه"> <!ENTITY https-everywhere.about.created_by "نوشته‌شده توسط"> @@ -16,10 +16,10 @@ <!ENTITY https-everywhere.about.donate_eff "به EFF کمک مالی کنید."> <!ENTITY https-everywhere.menu.donate_eff_imperative "به EFF کمک مالی کنید."> -<!ENTITY https-everywhere.menu.about "درباره‌ی HTTPS همه‌جا"> +<!ENTITY https-everywhere.menu.about "درباره HTTPS سراسری"> <!ENTITY https-everywhere.menu.observatory "تنظیم‌های رصدخانه‌ی SSL"> -<!ENTITY https-everywhere.menu.globalEnable "HTTPS همه‌جا را فعال کنید"> -<!ENTITY https-everywhere.menu.globalDisable "HTTPS همه‌جا را غیرفعال کنید"> +<!ENTITY https-everywhere.menu.globalEnable "HTTPS سراسری را فعال کنید "> +<!ENTITY https-everywhere.menu.globalDisable "HTTPS سراسری را غیرفعال کنید"> <!ENTITY https-everywhere.menu.blockHttpRequests "مسدود کردن تمام درخواست های HTTP"> <!ENTITY https-everywhere.menu.showCounter "نمایش شمارنده"> <!ENTITY https-everywhere.menu.viewAllRules "نمایش همه قوانین "> @@ -27,20 +27,20 @@ <!ENTITY https-everywhere.prefs.title "تنظیم‌های HTTPS همه‌جا"> <!ENTITY https-everywhere.prefs.enable_all "همه‌ی موارد را فعال کنید"> <!ENTITY https-everywhere.prefs.disable_all "همه‌ی موارد را غیرفعال کنید"> -<!ENTITY https-everywhere.prefs.reset_defaults "بازگشت به تنظیم‌های اولیه"> +<!ENTITY https-everywhere.prefs.reset_defaults "بازنشانی به پیشفرض"> <!ENTITY https-everywhere.prefs.search "جستجو"> -<!ENTITY https-everywhere.prefs.site "وب‌سایت"> +<!ENTITY https-everywhere.prefs.site "پایگاه"> <!ENTITY https-everywhere.prefs.notes "یادداشت‌ها"> -<!ENTITY https-everywhere.prefs.list_caption "کدام روال‌های تغییر مسیر HTTPS باید اعمال شوند؟"> +<!ENTITY https-everywhere.prefs.list_caption "کدام قوانین تغییر مسیر HTTPS باید اعمال گردد؟"> <!ENTITY https-everywhere.prefs.enabled "فعال"> <!ENTITY https-everywhere.prefs.ruleset_howto "شما می‌توانید یادبگیرید که مجموعه روال‌های خود را بنویسید (تا از وب‌سایت‌های دیگر پشتیبانی کنید)"> <!ENTITY https-everywhere.prefs.here_link "اینجا"> <!ENTITY https-everywhere.prefs.toggle "تغییر"> -<!ENTITY https-everywhere.prefs.reset_default "بازگشت به تنظیم‌های اولیه"> +<!ENTITY https-everywhere.prefs.reset_default "بازنشانی به پیشفرض"> <!ENTITY https-everywhere.prefs.view_xml_source "مشاهده منبع XML"> <!ENTITY https-everywhere.chrome.stable_rules "قوانین پایدار"> -<!ENTITY https-everywhere.chrome.stable_rules_description "اجبار اتصال رمزگذاری شده به این وب سایت:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "اتصالات رمزگذاری را برای این وبگاه ها اجبارکن :"> <!ENTITY https-everywhere.chrome.experimental_rules "قوانین تجربی"> <!ENTITY https-everywhere.chrome.experimental_rules_description "ممکن است علت، هشدار و یا شکستگی باشد. غیر فعال به طور پیش فرض."> <!ENTITY https-everywhere.chrome.add_rule "اضافه کردن یک قانون برای این سایت">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 03 Jun '16

03 Jun '16

commit 10e0fbccf3dcadb3443d1b3708cc882e9dda0808 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 3 10:45:24 2016 +0000 Update translations for https_everywhere_completed --- fa/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index c2309b9..2379fd3 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -5,6 +5,7 @@ <!ENTITY https-everywhere.about.created_by "نوشته‌شده توسط"> <!ENTITY https-everywhere.about.and "، و"> <!ENTITY https-everywhere.about.librarians "کتابداران قوانین"> +<!ENTITY https-everywhere.about.add_new_rule "افزودن قانون جدید"> <!ENTITY https-everywhere.about.thanks "با تشکر از"> <!ENTITY https-everywhere.about.many_contributors "بسیار زیادی همکار، از جمله"> <!ENTITY https-everywhere.about.noscript "همچنین، تکه‌کدهایی از HTTPS Everywhere براساس کد NoScript توسط Giorgio Maone و دیگران نوشته شده است. ما از کار فوق‌العاده‌شان سپاسگذاریم!">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Jun '16

03 Jun '16

commit 10b41dd4fa5b731d167c8ab4aad96de090d3bca6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 3 10:45:17 2016 +0000 Update translations for https_everywhere --- fa/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 6ef6334..2379fd3 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "نوشته‌شده توسط"> <!ENTITY https-everywhere.about.and "، و"> <!ENTITY https-everywhere.about.librarians "کتابداران قوانین"> -<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> +<!ENTITY https-everywhere.about.add_new_rule "افزودن قانون جدید"> <!ENTITY https-everywhere.about.thanks "با تشکر از"> <!ENTITY https-everywhere.about.many_contributors "بسیار زیادی همکار، از جمله"> <!ENTITY https-everywhere.about.noscript "همچنین، تکه‌کدهایی از HTTPS Everywhere براساس کد NoScript توسط Giorgio Maone و دیگران نوشته شده است. ما از کار فوق‌العاده‌شان سپاسگذاریم!">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 03 Jun '16

03 Jun '16

commit a2c36b7173ac942adf8f9ce93a527aaf2c0da9a2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 3 10:15:27 2016 +0000 Update translations for https_everywhere_completed --- lt/https-everywhere.dtd | 1 + ru/https-everywhere.dtd | 1 + 2 files changed, 2 insertions(+) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index 063c38d..3d995b4 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -5,6 +5,7 @@ <!ENTITY https-everywhere.about.created_by "Sukūrė"> <!ENTITY https-everywhere.about.and "ir"> <!ENTITY https-everywhere.about.librarians "Taisyklių bibliotekininkai"> +<!ENTITY https-everywhere.about.add_new_rule "Pridėti naują taisyklę"> <!ENTITY https-everywhere.about.thanks "Dėkojame"> <!ENTITY https-everywhere.about.many_contributors "Daugybė pagalbininkų, įskaitant"> <!ENTITY https-everywhere.about.noscript "Taip pat, dalis HTTPS Everywhere yra paremta ,Giorgio Maone ir kitų kurtu, NoScript kodu. Mes esame dėkingi už jų nuostabų darbą!"> diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd index bb7e840..c8555af 100644 --- a/ru/https-everywhere.dtd +++ b/ru/https-everywhere.dtd @@ -5,6 +5,7 @@ <!ENTITY https-everywhere.about.created_by "Авторы"> <!ENTITY https-everywhere.about.and ", и"> <!ENTITY https-everywhere.about.librarians "Хранители правил"> +<!ENTITY https-everywhere.about.add_new_rule "Добавить новое правило"> <!ENTITY https-everywhere.about.thanks "Благодарности"> <!ENTITY https-everywhere.about.many_contributors "Многим участникам, включая"> <!ENTITY https-everywhere.about.noscript "Кроме того, фрагменты HTTPS Everywhere основаны на коде, взятом из NoScript разработчика Giorgio Maone и других авторов. Мы благодарны им за отличную работу!">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Jun '16

03 Jun '16

commit e17e40b633bb5790ccabdb465d269b271bd495ef Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 3 10:15:15 2016 +0000 Update translations for https_everywhere --- lt/https-everywhere.dtd | 2 +- ru/https-everywhere.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index 42b3b1f..3d995b4 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "Sukūrė"> <!ENTITY https-everywhere.about.and "ir"> <!ENTITY https-everywhere.about.librarians "Taisyklių bibliotekininkai"> -<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> +<!ENTITY https-everywhere.about.add_new_rule "Pridėti naują taisyklę"> <!ENTITY https-everywhere.about.thanks "Dėkojame"> <!ENTITY https-everywhere.about.many_contributors "Daugybė pagalbininkų, įskaitant"> <!ENTITY https-everywhere.about.noscript "Taip pat, dalis HTTPS Everywhere yra paremta ,Giorgio Maone ir kitų kurtu, NoScript kodu. Mes esame dėkingi už jų nuostabų darbą!"> diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd index 51ea033..c8555af 100644 --- a/ru/https-everywhere.dtd +++ b/ru/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "Авторы"> <!ENTITY https-everywhere.about.and ", и"> <!ENTITY https-everywhere.about.librarians "Хранители правил"> -<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> +<!ENTITY https-everywhere.about.add_new_rule "Добавить новое правило"> <!ENTITY https-everywhere.about.thanks "Благодарности"> <!ENTITY https-everywhere.about.many_contributors "Многим участникам, включая"> <!ENTITY https-everywhere.about.noscript "Кроме того, фрагменты HTTPS Everywhere основаны на коде, взятом из NoScript разработчика Giorgio Maone и других авторов. Мы благодарны им за отличную работу!">

1 0

[tor-browser-bundle/master] Bug 18291: Remove some uses of libfaketime
by gk＠torproject.org 03 Jun '16

03 Jun '16

commit 3acd55740d447b2afb47ab5da5e3eece93337829 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 23 19:58:44 2016 +0200 Bug 18291: Remove some uses of libfaketime Completely stop using libfaketime for Linux builds. For Windows builds we have to keep using it for the tor, pluggable-transports and bundle steps. For OSX builds, we keep it in the bundle steps for the timestamp added when creating the dmg file with genisoimage. --- gitian/descriptors/linux/gitian-bundle.yml | 16 ++++------- gitian/descriptors/linux/gitian-firefox.yml | 30 ++------------------ .../linux/gitian-pluggable-transports.yml | 4 +-- gitian/descriptors/linux/gitian-tor.yml | 4 +-- gitian/descriptors/linux/gitian-utils.yml | 17 +++++------ gitian/descriptors/mac/gitian-firefox.yml | 29 ++----------------- .../mac/gitian-pluggable-transports.yml | 4 +-- gitian/descriptors/mac/gitian-utils.yml | 33 ++++++++-------------- gitian/descriptors/windows/gitian-firefox.yml | 23 ++------------- gitian/descriptors/windows/gitian-utils.yml | 15 +++++----- .../patches/openssl-Make-build-reproducible.patch | 28 ++++++++++++++++++ 11 files changed, 67 insertions(+), 136 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 0316148..105cab7 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -28,8 +28,6 @@ remotes: "dir": "meek" - "url": "https://github.com/googlei18n/noto-fonts.git" "dir": "noto-fonts" -- "url": "https://github.com/wolfcw/libfaketime" - "dir": "faketime" files: - "tor-browser-linux32-gbuilt.zip" - "tor-browser-linux64-gbuilt.zip" @@ -61,21 +59,13 @@ files: script: | INSTDIR="$HOME/install" source versions + export REFERENCE_DATETIME export LIBRARY_PATH="$INSTDIR/lib" export TZ=UTC export LC_ALL=C export TORBROWSER_VERSION=`cat bare-version` umask 0022 - # Building libfaketime - cd faketime - make - DESTDIR="$INSTDIR/faketime" make install - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME=$REFERENCE_DATETIME - export FAKETIME_SKIP_CMDS="rsync" - cd .. - mkdir -p $OUTDIR/ # When we build with MULTI_LINGUAL=1, the browser will be packaged inside a # directory named tor-browser (instead of tor-browser_en-US). Therefore we @@ -202,6 +192,7 @@ script: | cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js + touch --date="$REFERENCE_DATETIME" defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd @@ -237,6 +228,7 @@ script: | # app.update.url). pushd ${PKG_DIR}/Browser/ echo ${PKG_LOCALE} > update.locale + touch --date="$REFERENCE_DATETIME" update.locale zip -Xm omni.ja update.locale popd fi @@ -267,6 +259,7 @@ script: | cp ~/build/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js + touch --date="$REFERENCE_DATETIME" defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd @@ -276,6 +269,7 @@ script: | # recreate precomplete file (needs to be accurate for full MAR updates). pushd tor-browser_$LANG/Browser/ echo "$LANG" > update.locale + touch --date="$REFERENCE_DATETIME" update.locale zip -Xm omni.ja update.locale rm -rf dictionaries rm -f precomplete diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 22dcbd4..1316ed8 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -28,8 +28,6 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" -- "url": "https://github.com/wolfcw/libfaketime" - "dir": "faketime" files: - "binutils-linux32-utils.zip" - "binutils-linux64-utils.zip" @@ -41,6 +39,7 @@ files: script: | source versions INSTDIR="$HOME/install" + export REFERENCE_DATETIME export CFLAGS="-frandom-seed=tor" export CXXFLAGS="-frandom-seed=tor" export TZ=UTC @@ -87,42 +86,17 @@ script: | mkdir -p $INSTDIR/Debug/Browser/components mkdir -p $INSTDIR/Debug/Browser/browser/components - # Building libfaketime - cd faketime - make - DESTDIR="$INSTDIR/faketime" make install - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME=$REFERENCE_DATETIME - cd .. - cd tor-browser # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - # |configure| can't cope with nano seconds faked. And even if we would revert - # that feature it would hang sometimes for unknown but to libfaketime related - # reasons. - export LD_PRELOAD="" + export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" - # We need libfaketime for all the timestamps e.g. written into the libraries. - # BUT we need to exclude |make build| from it. Otherwise the build fails close - # to the end, see #12461 comment 8 and later. Additionally, we need to avoid - # breaking the ICU compilation. Exlcuding |bash| helps here. See #12461 - # comment 13. Finally, we need to exclude |python2.7| as not doing so would - # stall the build right at the beginning. See #13877. - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME_SKIP_CMDS="python2.7,bash,make" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build - # Packaging is broken with libfaketime enabled, thus we disable it again. See - # #12461 comments 11 and 12 for details. - export LD_PRELOAD="" make -C obj-* package INNER_MAKE_PACKAGE=true - # Without libfaketime enabled we would get different omni.ja and *debug.zip - # files. - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $INSTDIR/Browser/firefox-bin diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a1cdc48..38804dd 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -7,7 +7,6 @@ architectures: - "i386" - "amd64" packages: -- "faketime" - "unzip" - "python-setuptools" - "python-dev" @@ -57,7 +56,7 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR - export FAKETIME=$REFERENCE_DATETIME + export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C export PYTHON=python2 @@ -262,7 +261,6 @@ script: | cd ../.. # 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 bc1dc67..bfb683a 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -7,7 +7,6 @@ architectures: - "i386" - "amd64" packages: -- "faketime" - "unzip" - "automake" - "libtool" @@ -30,7 +29,7 @@ files: script: | INSTDIR="$HOME/install" source versions - export FAKETIME=$REFERENCE_DATETIME + export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -94,7 +93,6 @@ script: | done # 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 e8801cc..0adcf5d 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -7,7 +7,6 @@ architectures: - "i386" - "amd64" packages: -- "faketime" - "automake" - "libtool" - "zip" @@ -33,6 +32,7 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" +- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -41,7 +41,7 @@ script: | source versions export TZ=UTC export LC_ALL=C - export FAKETIME=$REFERENCE_DATETIME + export REFERENCE_DATETIME umask 0022 # Config options for hardening-wrapper @@ -76,10 +76,6 @@ script: | # 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-* @@ -99,9 +95,9 @@ script: | cd .. # Building OpenSSL - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 tar xzf openssl.tar.gz cd openssl-* + patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then @@ -115,8 +111,6 @@ script: | make install cd .. - export LD_PRELOAD="" - # Building GMP tar xjf gmp.tar.bz2 cd gmp-* @@ -131,7 +125,10 @@ script: | cd .. # Grabbing the remaining results and making sure timestamps don't spoil them - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Since we stopped using libfaketime, the binutils, gcc, openssl, + # libevent archives are no longer reproducible. The main reason + # is that they include some .a archives which include timestamps. + # Those files are however not part of the files we ship. 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/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 17c4c8b..fdec679 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -15,8 +15,6 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" -- "url": "https://github.com/wolfcw/libfaketime" - "dir": "faketime" files: - "clang-linux64-wheezy-utils.zip" - "cctools.tar.gz" @@ -24,11 +22,11 @@ files: - "re-dzip.sh" - "dzip.sh" - "fix-info-plist.py" -- "libfaketime.patch" - "versions" script: | INSTDIR="$HOME/install/" source versions + export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -36,18 +34,6 @@ script: | mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/ mkdir -p $OUTDIR/ - # Building libfaketime. - cd faketime - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/libfaketime.patch - make - DESTDIR="$INSTDIR/faketime" make install - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME=$REFERENCE_DATETIME - cd .. - cd tor-browser # Extracting all the necessary tools tar xaf ../MacOSX10.7.sdk.tar.gz @@ -62,20 +48,9 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - # |configure| can't cope with nano seconds faked. And even if we would revert - # that feature it would hang sometimes for unknown but to libfaketime related - # reasons. - export LD_PRELOAD="" + export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We need libfaketime for all the timestamps e.g. written into the libraries. - # BUT we need to exclude |make build| from it. Otherwise the build fails close - # to the end, see #12812 comment 6 and #12461 comment 8 and later. - # Additionally, we need to exclude |rsync| due to #10153 which is reproducible - # reliably with the new libfaketime and |python2.7| as well as the build would - # stall otherwise right at the beginning. See #13877 for details. - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME_SKIP_CMDS="python2.7,rsync,make" make $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 33b134e..cb7ac5c 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -6,7 +6,6 @@ suites: architectures: - "i386" packages: -- "faketime" - "unzip" - "python-setuptools" - "python-dev" @@ -69,8 +68,7 @@ script: | INCLUDE_FTE=1 fi export LIBRARY_PATH="$INSTDIR/lib" - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME + export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index cef1533..33db2e8 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -7,7 +7,6 @@ architectures: - "i386" - "amd64" packages: -- "faketime" - "automake" - "libtool" - "zip" @@ -15,8 +14,6 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" -- "url": "https://github.com/wolfcw/libfaketime" - "dir": "faketime" - "url": "https://github.com/llvm-mirror/llvm" "dir": "llvm" - "url": "https://github.com/llvm-mirror/clang" @@ -27,13 +24,14 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "openssl.tar.gz" +- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" -- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions + export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -56,21 +54,13 @@ script: | make $MAKEOPTS make install cd $INSTDIR + # Since we stopped using libfaketime, the clang archive is no longer + # reproducible. The reason is that it includes some .a archives and + # other files which include timestamps. + # Those files are however not part of the files we ship. ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang cp *utils.zip $OUTDIR/ else - # Building libfaketime. - cd faketime - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/libfaketime.patch - make - DESTDIR="$INSTDIR/faketime" make install - export FAKETIME_SKIP_CMDS="make" - export FAKETIME=$REFERENCE_DATETIME - cd .. - # dpkg requires sbin directories in the PATH export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb @@ -91,7 +81,6 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. @@ -99,6 +88,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* + patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 @@ -111,20 +101,19 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - # |configure| can't cope with nano seconds faked. And even if we would revert - # that feature it would hang sometimes for unknown but to libfaketime related - # reasons. - export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. # Grabbing the results + # Since we stopped using libfaketime, the openssl archive is no + # longer reproducible. The main reason is that it includes some .a + # archives which include timestamps. + # Those files are however not part of the files we ship. cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 2686c5f..3261199 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -12,8 +12,6 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" -- "url": "https://github.com/wolfcw/libfaketime" - "dir": "faketime" files: - "gcc-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" @@ -28,6 +26,7 @@ files: script: | INSTDIR="$HOME/install" source versions + export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -44,14 +43,6 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$PATH - # Building libfaketime - cd faketime - make - DESTDIR="$INSTDIR/faketime" make install - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME=$REFERENCE_DATETIME - cd .. - # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec sed 's/msvcrt/msvcr100/' -i msvcr100.spec @@ -82,10 +73,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - # |configure| can't cope with nano seconds faked. And even if we would revert - # that feature it would hang sometimes for unknown but to libfaketime related - # reasons. - export LD_PRELOAD="" + export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # @@ -93,13 +81,6 @@ script: | cp ~/build/i686* ~/build/bin/ export PATH=~/build/bin:$PATH # - # We need libfaketime for all the timestamps e.g. written into the libraries. - # BUT we need to exclude |make build| from it. Otherwise the build fails close - # to the end, see #12811 comment 14 and #12461 comment 8 and later. - # Additionally, we need to exclude |python2.7| as well as the build would - # stall otherwise right at the beginning. See #13877 for details. - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME_SKIP_CMDS="python2.7,make" make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 2767bad..0876bff 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -5,7 +5,6 @@ suites: architectures: - "i386" packages: -- "faketime" - "automake" - "libtool" - "zip" @@ -28,6 +27,7 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" +- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -39,6 +39,7 @@ files: script: | INSTDIR="$HOME/install" source versions + export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -115,13 +116,6 @@ script: | cp i686-w64-mingw32/libgcc/shlib/libgcc_s_sjlj-1.dll $INSTDIR/gcclibs cd .. - # XXX: Build the libraries we include into the bundles deterministically. As - # libfaketime breaks the mingw-w64 build (probably due to bug 11459) we omit - # the compiler and linker from it. It seems we get away with this strategy - # and the libgcc* and libss* which we ship, too, are still built in a - # reproducible fashion. - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME # Building zlib export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" @@ -143,6 +137,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* + patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl @@ -185,6 +180,10 @@ script: | cd .. # Grabbing the remaining results + # Since we stopped using libfaketime, the gcc, gmp, zlib, openssl, + # libevent, mingw-w64 archives are no longer reproducible. The main + # reason is that they include some .a archives which include timestamps. + # Those files are however not part of the files we ship. cd $INSTDIR # We might want to bump binutils independent of bumping mingw-w64. touch binutils-$BINUTILS_VER-win32-utils.zip diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch new file mode 100644 index 0000000..d86f5ba --- /dev/null +++ b/gitian/patches/openssl-Make-build-reproducible.patch @@ -0,0 +1,28 @@ +From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 +From: Kurt Roeckx <kurt(a)roeckx.be> +Date: Fri, 2 Jan 2015 12:27:57 +0100 +Subject: [PATCH] Make build reproducible + +It contained a date on when it was build. + +Reviewed-by: Rich Salz <rsalz(a)openssl.org> +--- + crypto/cversion.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/crypto/cversion.c b/crypto/cversion.c +index 9e6f50d78182..c417d1d1121f 100644 +--- a/crypto/cversion.c ++++ b/crypto/cversion.c +@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) + return OPENSSL_VERSION_TEXT; + if (t == SSLEAY_BUILT_ON) { + #ifdef DATE ++# ifdef OPENSSL_USE_BUILD_DATE + return (DATE); ++# else ++ return("built on: reproducible build, date unspecified"); ++# endif + #else + return ("built on: date not available"); + #endif

1 0

[tor-browser-bundle/master] Bug 18333: Upgrade go to 1.6.2.
by gk＠torproject.org 03 Jun '16

03 Jun '16

commit 778fd2d07bc40c0458ad7a477b6079a99305071d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 10 08:32:54 2016 +0000 Bug 18333: Upgrade go to 1.6.2. It now requires an installation of go 1.4.x to bootstrap the build. We set CGO_ENABLED=0 when building the bootstrap go compiler because go 1.4.3 won't build with a newer GNU toolchain: https://github.com/golang/go/issues/13114. It didn't cause a problem for me on Ubuntu 14.04, but this will prevent it from breaking in the future. We don't need cgo in the bootstrap compiler. The other change is that the go build system no longer allows us to pass a command with arguments for CC_FOR_TARGET. I opened a ticket for it: https://github.com/golang/go/issues/15457. We need -I and -L arguments in the mac build so that gcc gan find its headers and libraries. So we wrap up the arguments in a shell script and use the shell script as CC_FOR_TARGET. --- .../linux/gitian-pluggable-transports.yml | 12 ++++++++++ .../mac/gitian-pluggable-transports.yml | 27 ++++++++++++++++----- .../windows/gitian-pluggable-transports.yml | 28 +++++++++++++++++----- gitian/fetch-inputs.sh | 5 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 9 +++++-- gitian/versions.alpha | 9 +++++-- gitian/versions.beta | 9 +++++-- gitian/versions.nightly | 9 +++++-- 9 files changed, 87 insertions(+), 23 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 38ae561..a1cdc48 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -46,6 +46,7 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" +- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "gmp-linux32-utils.zip" @@ -74,6 +75,17 @@ script: | # FTE only needs libgmp.so.10 and no libgmpxx anymore. cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor + # Building go 1.4.x + # This is needed to bootstrap the go that we actually use + # https://golang.org/doc/install/source#go14 + tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' + cd go1.4/src + # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. + # https://github.com/golang/go/issues/13114#issuecomment-186922245 + CGO_ENABLED=0 ./make.bash + cd ../.. + export GOROOT_BOOTSTRAP="$PWD/go1.4" + # Building go # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index fbf38c2..33b134e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -45,6 +45,7 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" +- "go14.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -103,19 +104,33 @@ script: | export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" + # Building go 1.4.x + # This is needed to bootstrap the go that we actually use + # https://golang.org/doc/install/source#go14 + tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' + cd go1.4/src + # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. + # https://github.com/golang/go/issues/13114#issuecomment-186922245 + # Disable CC etc. that are set up for cross builds. + CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash + cd ../.. + export GOROOT_BOOTSTRAP="$PWD/go1.4" + # Building go + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=darwin export GOARCH=386 tar xvf go.tar.gz cd go/src - # http://golang.org/cmd/cgo/: - # "To enable cgo during cross compiling builds, set the CGO_ENABLED - # environment variable to 1 when building the Go tools with make.bash. Also, - # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used - # for compiling for the host." - CGO_ENABLED=1 CC_FOR_TARGET="$CC $CFLAGS $LDFLAGS" CC= CFLAGS= LDFLAGS= ./make.bash + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index f073fd1..7e8a349 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -47,6 +47,7 @@ files: - "wine-wrappers" - "python.msi" - "py2exe.exe" +- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "pyc-timestamp.sh" @@ -139,19 +140,34 @@ script: | cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $WINEROOT/windows/ cd .. + # Building go 1.4.x + # This is needed to bootstrap the go that we actually use + # https://golang.org/doc/install/source#go14 + tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' + cd go1.4/src + # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. + # https://github.com/golang/go/issues/13114#issuecomment-186922245 + # Disable CC etc. that are set up for cross builds. + CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash + cd ../.. + export GOROOT_BOOTSTRAP="$PWD/go1.4" + # Building go + CC=i686-w64-mingw32-gcc + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=windows export GOARCH=386 tar xvf go.tar.gz cd go/src - # http://golang.org/cmd/cgo/: - # "To enable cgo during cross compiling builds, set the CGO_ENABLED - # environment variable to 1 when building the Go tools with make.bash. Also, - # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used - # for compiling for the host." - CGO_ENABLED=1 CC_FOR_TARGET="i686-w64-mingw32-gcc" CC= CFLAGS= LDFLAGS= ./make.bash + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 99b984b..ca43637 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -174,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -243,6 +243,7 @@ ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz +ln -sf "$GO14_PACKAGE" go14.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a966626..7d92e36 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -143,7 +143,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 8bbfeb3..07da5cb 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,7 +60,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.2 NSIS_VER=2.51 ## File names for the source packages @@ -83,6 +85,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -110,7 +113,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -140,6 +144,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fe1eb9b..2618629 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -60,7 +60,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.2 NSIS_VER=2.51 ## File names for the source packages @@ -83,6 +85,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -110,7 +113,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -140,6 +144,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… diff --git a/gitian/versions.beta b/gitian/versions.beta index 87680b7..24569ec 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -47,7 +47,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -68,6 +70,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf @@ -92,7 +95,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da @@ -118,6 +122,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4db79f7..815a169 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -67,7 +67,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.2 NSIS_VER=2.51 ## File names for the source packages @@ -90,6 +92,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -117,7 +120,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -147,6 +151,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA…

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 03 Jun '16

03 Jun '16

commit f238fa33d0d55da40ff97452f3168ca0ffdbfcce Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 3 09:45:26 2016 +0000 Update translations for liveusb-creator_completed --- es/es.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/es/es.po b/es/es.po index 7e2079b..8f2d089 100644 --- a/es/es.po +++ b/es/es.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Adolfo Jayme Barrientos, 2014 +# Fitoschido, 2014 # Adrián Sandí <asandi.sagot(a)gmail.com>, 2013 # dark_yoshi <angelargi(a)yahoo.es>, 2014 # BL <tresemes3(a)gmail.com>, 2014 # Carlos Capote <carloscapote(a)masticable.org>, 2012 # Dani Lobo <dani(a)dominiosvm.es>, 2013 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 # F Xavier Castane <electromigracion(a)gmail.com>, 2015 # Jose Luis <joseluis.tirado(a)gmail.com>, 2015 # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2016-06-03 09:29+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +95,7 @@ msgid "" "\n" "\n" "</ul>" -msgstr "<ul>\n<li>Actualiza otra memoria USB de Tails a la misma versión de Tails que está usando en este momento.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que se va a actualizar se conserva.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que está usando en este momento no se copia.</li>\n\n\n</ul>" +msgstr "<ul>\n<li>Actualiza otra memoria USB de Tails a la misma versión de Tails que está usando en este momento.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que se va a actualizar se conserva.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que está usando en este momento no se ha copiado.</li>\n\n\n</ul>" #: ../liveusb/launcher_ui.py:159 msgid "" @@ -122,7 +123,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "Con la asignación de espacio extra para un área persistente en su memoria USB, será capaz de almacenar datos y hacer modificaciones persistentes a su sistema operativo autoarrancable. Sin ello, no será capaz de guardar datos que persistan después de un reinicio." +msgstr "Con la asignación de espacio extra para un área permanente en su memoria USB, será capaz de almacenar datos y hacer modificaciones permanentes a su sistema operativo autoarrancable. Sin ello, no será capaz de guardar datos que permanezcan después de un reinicio." #: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Jun '16

03 Jun '16

commit db3ad6d95ecd40a51b2cea437ce979d40638d3d4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 3 09:45:20 2016 +0000 Update translations for liveusb-creator --- es/es.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/es/es.po b/es/es.po index 7e2079b..8f2d089 100644 --- a/es/es.po +++ b/es/es.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Adolfo Jayme Barrientos, 2014 +# Fitoschido, 2014 # Adrián Sandí <asandi.sagot(a)gmail.com>, 2013 # dark_yoshi <angelargi(a)yahoo.es>, 2014 # BL <tresemes3(a)gmail.com>, 2014 # Carlos Capote <carloscapote(a)masticable.org>, 2012 # Dani Lobo <dani(a)dominiosvm.es>, 2013 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 # F Xavier Castane <electromigracion(a)gmail.com>, 2015 # Jose Luis <joseluis.tirado(a)gmail.com>, 2015 # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2016-06-03 09:29+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +95,7 @@ msgid "" "\n" "\n" "</ul>" -msgstr "<ul>\n<li>Actualiza otra memoria USB de Tails a la misma versión de Tails que está usando en este momento.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que se va a actualizar se conserva.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que está usando en este momento no se copia.</li>\n\n\n</ul>" +msgstr "<ul>\n<li>Actualiza otra memoria USB de Tails a la misma versión de Tails que está usando en este momento.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que se va a actualizar se conserva.</li>\n\n<li>El almacenamiento cifrado persistente de la memoria USB de Tails que está usando en este momento no se ha copiado.</li>\n\n\n</ul>" #: ../liveusb/launcher_ui.py:159 msgid "" @@ -122,7 +123,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "Con la asignación de espacio extra para un área persistente en su memoria USB, será capaz de almacenar datos y hacer modificaciones persistentes a su sistema operativo autoarrancable. Sin ello, no será capaz de guardar datos que persistan después de un reinicio." +msgstr "Con la asignación de espacio extra para un área permanente en su memoria USB, será capaz de almacenar datos y hacer modificaciones permanentes a su sistema operativo autoarrancable. Sin ello, no será capaz de guardar datos que permanezcan después de un reinicio." #: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 #, python-format

1 0

[ooni-probe/master] When we don't find the report inside of reporting.yaml upload to the canonical bouncer.
by art＠torproject.org 03 Jun '16

03 Jun '16

commit de75b701f0b5d25e4362cdaacb7c20815a41928d Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue May 31 13:57:07 2016 +0200 When we don't find the report inside of reporting.yaml upload to the canonical bouncer. * This fixes #515 --- ooni/__init__.py | 14 +++++++++++--- ooni/oonicli.py | 11 ++++------- ooni/report/tool.py | 45 +++++++++++++++++++++++++++------------------ 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 70d56cf..c416dee 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -5,7 +5,15 @@ __version__ = "1.5.1.dev0" # This is the version number of resources to be downloaded # when a release is made it should be aligned to __version__ __resources_version__ = "1.4.2" +canonical_bouncer = 'httpo://nkvphnp3p6agi5qq.onion' -__all__ = ['config', 'inputunit', 'kit', - 'lib', 'nettest', 'oonicli', 'report', 'reporter', - 'templates', 'utils'] + +__all__ = [ + 'common', + 'deckgen', + 'nettest', + 'report', + 'resources', + 'templates', + 'utils' +] diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 47c26b2..5aa538c 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -10,7 +10,7 @@ import urlparse from twisted.python import usage from twisted.internet import defer -from ooni import errors, __version__ +from ooni import errors, __version__, canonical_bouncer from ooni.settings import config from ooni.utils import log from backend_client import CollectorClient @@ -44,12 +44,9 @@ class Options(usage.Options): ["collector", "c", None, "Specify the address of the collector for " "test results. In most cases a user will " "prefer to specify a bouncer over this."], - ["bouncer", "b", 'httpo://nkvphnp3p6agi5qq.onion', "Specify the " - "bouncer used to " - "obtain the " - "address of the " - "collector and " - "test helpers."], + ["bouncer", "b", canonical_bouncer, "Specify the bouncer used to " + "obtain the address of the " + "collector and test helpers."], ["logfile", "l", None, "Write to this logs to this filename."], ["pcapfile", "O", None, "Write a PCAP of the ooniprobe session to " "this filename."], diff --git a/ooni/report/tool.py b/ooni/report/tool.py index d80a8e0..faa407f 100644 --- a/ooni/report/tool.py +++ b/ooni/report/tool.py @@ -4,6 +4,7 @@ import sys from twisted.internet import defer +from ooni import canonical_bouncer from ooni.reporter import OONIBReporter, OONIBReportLog from ooni.utils import log @@ -11,6 +12,22 @@ from ooni.report import parser from ooni.settings import config from ooni.backend_client import BouncerClient, CollectorClient +(a)defer.inlineCallbacks +def lookup_collector_client(report_header, bouncer): + oonib_client = BouncerClient(bouncer) + net_tests = [{ + 'test-helpers': [], + 'input-hashes': report_header['input_hashes'], + 'name': report_header['test_name'], + 'version': report_header['test_version'], + }] + result = yield oonib_client.lookupTestCollector( + net_tests + ) + collector_client = CollectorClient( + address=result['net-tests'][0]['collector'] + ) + defer.returnValue(collector_client) @defer.inlineCallbacks def upload(report_file, collector=None, bouncer=None): @@ -26,34 +43,26 @@ def upload(report_file, collector=None, bouncer=None): report = parser.ReportLoader(report_file) if bouncer and collector_client is None: - oonib_client = BouncerClient(bouncer) - net_tests = [{ - 'test-helpers': [], - 'input-hashes': report.header['input_hashes'], - 'name': report.header['test_name'], - 'version': report.header['test_version'], - }] - result = yield oonib_client.lookupTestCollector( - net_tests - ) - collector_client = CollectorClient( - address=result['net-tests'][0]['collector'] - ) + collector_client = yield lookup_collector_client(report.header, + bouncer) if collector_client is None: try: collector_settings = report_log[report_file]['collector'] if collector_settings is None: - raise KeyError + log.msg("Skipping uploading of %s since this measurement " + "was run by specifying no collector." % + report_file) + defer.returnValue(None) elif isinstance(collector_settings, dict): collector_client = CollectorClient(settings=collector_settings) elif isinstance(collector_settings, str): collector_client = CollectorClient(address=collector_settings) except KeyError: - raise Exception( - "No collector or bouncer specified" - " and collector not in report log." - ) + log.msg("Could not find %s in reporting.yaml. Looking up " + "collector with canonical bouncer." % report_file) + collector_client = yield lookup_collector_client(report.header, + canonical_bouncer) oonib_reporter = OONIBReporter(report.header, collector_client) log.msg("Creating report for %s with %s" % (report_file,

1 0