January 2018 - tor-commits - lists.torproject.org

[webwml/master] delete obsolete docs/en/rpms.wml
by hiro＠torproject.org 30 Jan '18

30 Jan '18

commit 467ed909e08e152ab32ec986bcf77ddc5f4661f1 Author: nusenu <nusenu-github(a)riseup.net> Date: Tue Jan 23 14:41:06 2018 +0000 delete obsolete docs/en/rpms.wml --- docs/en/rpms.wml | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml deleted file mode 100644 index 77fd243f..00000000 --- a/docs/en/rpms.wml +++ /dev/null @@ -1,47 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: CentOS/Fedora Instructions" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page docs/documentation>">Documentation » </a> - <a href="<page docs/rpms>">RPMs</a> - </div> - <div id="maincol"> - <a id="rpms"></a> - <h2><a class="anchor" href="#rpms">Tor packages for RPM-based - linux distributions.</a></h2> - <br> - - <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3> - - <p>Use native Fedora packages for the Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> - packages for distribitons derived from RHEL. - </p> - - - <a id="source"></a> - <h2><a class="anchor" href="#source">Building from source</a></h2> - <br> - - <p> - If you'd like to build from source, please follow the <a - href="<gitblob>doc/contrib/tor-rpm-creation.txt">RPM creation instructions</a>. - </p> - - <hr> - - <p>If you have suggestions for improving this document, please <a - href="<page about/contact>">send them to us</a>. Thanks!</p> - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> \ No newline at end of file

1 0

[webwml/master] Merge branch 'master' of git-rw.torproject.org:project/web/webwml into remove_rpms_from_sidenav
by hiro＠torproject.org 30 Jan '18

30 Jan '18

commit c94a7c2c5535d0b0548ed0f99e8819ff5ff9a858 Merge: 467ed909 59a33abb Author: hiromipaw <hiro(a)torproject.org> Date: Tue Jan 30 12:04:40 2018 +0100 Merge branch 'master' of git-rw.torproject.org:project/web/webwml into remove_rpms_from_sidenav Makefile | 2 +- include/versions.wmi | 14 +- projects/en/torbrowser.wml | 4 +- projects/torbrowser/RecommendedTBBVersions | 20 +- projects/torbrowser/design/index.html.en | 763 ++++++++++++++++++----------- 5 files changed, 489 insertions(+), 314 deletions(-)

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 30 Jan '18

30 Jan '18

commit 1c96a21f7e70c003946c8d6d46daa4b73b7fe9f8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 30 10:48:55 2018 +0000 Update translations for tails-openpgp-applet_completed --- ru/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index dbae1cd33..21db88faa 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-01-12 22:03+0000\n" +"PO-Revision-Date: 2018-01-30 10:46+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 30 Jan '18

30 Jan '18

commit 3c37b71d1483a0be4096e1c5d5a596b2075210cd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 30 10:48:46 2018 +0000 Update translations for tails-openpgp-applet --- ru/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index dbae1cd33..21db88faa 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-01-12 22:03+0000\n" +"PO-Revision-Date: 2018-01-30 10:46+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[tor-messenger-build/master] Build 64bit Tor Messenger for Windows
by sukhbir＠torproject.org 29 Jan '18

29 Jan '18

commit 78bf2fd72676ca92fecfc464fb2bf494cbe19126 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jan 29 17:11:31 2018 -0500 Build 64bit Tor Messenger for Windows Inspired by #20636, build the 64bit version of Tor Messenger --- Makefile | 5 ++- projects/ctypes-otr/config | 2 +- projects/instantbird/config | 4 +++ projects/instantbird/mozconfig-windows-x86_64 | 10 ++++++ projects/libgpg-error/config | 2 +- projects/libotr/config | 7 +++-- projects/mozilla/STL_win64.patch | 24 ++++++++++++++ projects/mozilla/config | 2 ++ projects/tor-browser/config | 2 +- projects/tor-messenger/config | 18 +++++++---- rbm | 2 +- rbm.conf | 45 ++++++++++++++++++++------- tor-browser-build | 2 +- 13 files changed, 99 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index cdef67c..699ff19 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ rbm=./rbm/rbm all: tor-messenger -tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-osx-x86_64 +tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-windows-x86_64 tor-messenger-osx-x86_64 tor-messenger-release: submodule-update $(rbm) build tor-messenger-release --target tormessenger-all @@ -18,6 +18,9 @@ tor-messenger-linux-i686: submodule-update tor-messenger-windows-i686: submodule-update $(rbm) build tor-messenger --target tor-messenger --target tormessenger-windows-i686 +tor-messenger-windows-x86_64: submodule-update + $(rbm) build tor-messenger --target tor-messenger --target tormessenger-windows-x86_64 + tor-messenger-osx-x86_64: submodule-update $(rbm) build tor-messenger --target tor-messenger --target tormessenger-osx-x86_64 diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index a3feb2a..0642a5b 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -10,7 +10,7 @@ filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_i var: lib_glob: 'lib/*.so*' targets: - windows-i686: + windows: var: lib_glob: 'bin/*.dll' osx-x86_64: diff --git a/projects/instantbird/config b/projects/instantbird/config index 446330c..1ab021a 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -21,6 +21,10 @@ targets: var: martools_filename: mar-tools-win32.zip archive_suffix: zip + windows-x86_64: + var: + martools_filename: mar-tools-win64.zip + archive_suffix: zip linux: var: arch_deps: diff --git a/projects/instantbird/mozconfig-windows-x86_64 b/projects/instantbird/mozconfig-windows-x86_64 new file mode 100644 index 0000000..a8fbcc3 --- /dev/null +++ b/projects/instantbird/mozconfig-windows-x86_64 @@ -0,0 +1,10 @@ +export CROSS_COMPILE=1 + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw + +ac_add_options --target=x86_64-w64-mingw32 +ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- + +ac_add_options --enable-default-toolkit=cairo-windows +ac_add_options --enable-strip +ac_add_options --disable-sandbox diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index a815397..512f5a8 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -9,7 +9,7 @@ var: container: use_container: 1 targets: - windows-i686: + windows: var: arch_deps: - gettext diff --git a/projects/libotr/config b/projects/libotr/config index 12cf34b..6a76aec 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -10,13 +10,16 @@ var: container: use_container: 1 targets: - windows-i686: + windows: var: arch_deps: - gettext - configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS_otr") %]" LDFLAGS="[% c("var/LDFLAGS_otr") %]" CC="i686-w64-mingw32-gcc -static-libgcc"' + configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS_otr") %]" LDFLAGS="[% c("var/LDFLAGS_otr") %]"' CFLAGS_otr: '[% c("var/CFLAGS") %] -Wl,-Bstatic,-L/var/tmp/dist/libgcrypt/lib,-lgcrypt,-L/var/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic' LDFLAGS_otr: '[% c("var/LDFLAGS") %] -Wl,-Bstatic,-L/var/tmp/dist/libgcrypt/lib,-lgcrypt,-L/var/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic' + flag_mwindows: '-mwindows' + compiler: mingw-w64 + osx-x86_64: var: arch_deps: diff --git a/projects/mozilla/STL_win64.patch b/projects/mozilla/STL_win64.patch new file mode 100644 index 0000000..e528905 --- /dev/null +++ b/projects/mozilla/STL_win64.patch @@ -0,0 +1,24 @@ +From 8f8c1a1069d4907d3cedae578975225d8caeecaf Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Sat, 12 Aug 2017 22:00:13 +0200 +Subject: [PATCH] Bug 23231: disable STL Wrappers on Windows + +Workaround for: +https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 +--- + old-configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/old-configure.in b/old-configure.in +index f5a2f05..e247551 100644 +--- a/old-configure.in ++++ b/old-configure.in +@@ -1338,7 +1338,7 @@ MOZ_CXX11 + AC_LANG_C + + case "${OS_TARGET}" in +-Darwin) ++WINNT|Darwin) + ;; + *) + STL_FLAGS="-I${DIST}/stl_wrappers" diff --git a/projects/mozilla/config b/projects/mozilla/config index 39a2f81..f3c4234 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -11,3 +11,5 @@ input_files: - filename: 0003-OSX-package-as-tar.bz2.patch - filename: 0004-Updater-fixups-for-TM.patch - filename: 0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch + - filename: STL_win64.patch + enable: '[% c("var/windows-x86_64") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 56c4171..949b048 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -11,7 +11,7 @@ input_files: var: base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]" targets: - windows-i686: + windows: URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe" osx-x86_64: URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg" diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 92fc588..61b439a 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -41,6 +41,8 @@ input_files: enable: '[% c("var/osx") %]' - project: nsis name: nsis + target: + - tormessenger-windows-i686 enable: '[% c("var/windows") %]' - URL: https://people.torproject.org/~mikeperry/mirrors/sources/msvcr100.dll sha256sum: 1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -55,16 +57,20 @@ var: container: use_container: 1 targets: + windows: + var: + arch_deps: + - python-pefile windows-i686: var: bundle_filename: 'tormessenger-install-[% c("version") %]_en-US.exe' mar_osname: win32 - arch_deps: - - nsis - - python - - python-dev - - build-essential - - python-pefile + windows-x86_64: + var: + bundle_filename: 'tormessenger-install-[% c("version") %]_en-US.exe' + mar_osname: win64 + container: + arch: i386 osx-x86_64: var: bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg' diff --git a/rbm b/rbm index 5c89374..b83c74c 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438 +Subproject commit b83c74ca4b91732f64011f0255a1594f7747b340 diff --git a/rbm.conf b/rbm.conf index 74af21e..886d777 100644 --- a/rbm.conf +++ b/rbm.conf @@ -11,7 +11,7 @@ pkg_type: build # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id. buildconf: - num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "8" %]' + num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "2" %]' var: tormessenger_version: '0.6.0b1' @@ -24,7 +24,7 @@ var: # in the same order. In the cases where the installation order is # important, sort_deps should be set to 0. sort_deps: 1 - build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 8 } })).substr(0, 6) %]' + build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 2 } })).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] @@ -121,18 +121,46 @@ targets: - zip - unzip + tormessenger-windows-x86_64: + - windows-x86_64 + - windows + - tor-messenger + tormessenger-windows-i686: - windows-i686 + - windows - tor-messenger + + windows-x86_64: + arch: x86_64 + var: + windows-x86_64: 1 + osname: windows-x86_64 + container: + arch: amd64 + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 + windows-i686: arch: i686 var: - windows: 1 + windows-i686: 1 osname: windows-i686 container: - suite: precise arch: i386 - configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' + faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1 + setarch: | + if test -z "$RBM_SETARCH" + then + export RBM_SETARCH=1 + exec setarch i686 ./build + fi + + windows: + var: + windows: 1 + container: + suite: jessie + configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' flag_mwindows: '-mwindows' @@ -145,13 +173,6 @@ targets: - libtool - zip - unzip - faketime_path: /usr/lib/faketime/libfaketime.so.1 - setarch: | - if test -z "$RBM_SETARCH" - then - export RBM_SETARCH=1 - exec setarch i686 ./build - fi tormessenger-osx-x86_64: - osx-x86_64 diff --git a/tor-browser-build b/tor-browser-build index d2dee35..62ee652 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit d2dee352354ee77cd26ac37bef41322df2729ff8 +Subproject commit 62ee652c588858ded1aa02261510f1c05234795a

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 29 Jan '18

29 Jan '18

commit 4e2bc2ce5140290eef4f0d04ed9f24d98cab0588 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 29 19:50:31 2018 +0000 Update translations for tor-browser-manual --- sv/sv.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index fe02864d5..b33d863bb 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -1503,8 +1503,8 @@ msgid "" "be blocked than obfs3 bridges." msgstr "" "obfs4 gör att Tor-trafiken ser slumpmässigt ut som obfs3, och hindrar också " -"censorer från att hitta broar via Internet-skanning. obfs4-broar är mindre " -"benägna att blockeras än obfs3-broar." +"censorer från att hitta broar via Internet-skanning. obfs4-bryggor är mindre" +" benägna att blockeras än obfs3-broar." #: transports.page:56 msgid "Scramblesuit" @@ -1512,7 +1512,7 @@ msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." -msgstr "ScrambleSuit liknar obfs4 men har en annan uppsättning av broar." +msgstr "ScrambleSuit liknar obfs4 men har en annan uppsättning av bryggor." #: transports.page:69 msgid "FTE" @@ -1554,7 +1554,7 @@ msgid "" "for the first time." msgstr "" "Du bör kunna börja surfa på webben med Tor Browser snart efter att du kör " -"programmet och klickar på \"Anlslut\"-knappen om du använder den för första " +"programmet och klickar på \"Anslut\"-knappen om du använder den för första " "gången." #: troubleshooting.page:21 @@ -1662,7 +1662,7 @@ msgstr "" #: uninstalling.page:32 msgid "Delete the Tor Browser folder." -msgstr "Radera Tor mapp" +msgstr "Radera Tor mappen" #: uninstalling.page:35 msgid "Empty your Trash" @@ -1761,11 +1761,11 @@ msgid "" "will now be running the latest version." msgstr "" "Vänta på att uppdateringen ska hämtas och installeras, starta sedan om Tor " -"Browser. Du kommer nu att köra du den senaste versionen." +"Browser. Du kommer nu att köra den senaste versionen." #: updating.page:58 msgid "Updating Tor Browser manually" -msgstr "Uppdatera Tor webbläsare manuellt" +msgstr "Uppdatera Tor webbläsaren manuellt" #: updating.page:61 msgid ""

1 0

[tor-browser-build/master] Bug 23738: add ansible scripts to deploy fpcentral
by gk＠torproject.org 29 Jan '18

29 Jan '18

commit c9a600cc365993321a5e9fb9db71f5112b65d78c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 4 19:52:55 2017 +0100 Bug 23738: add ansible scripts to deploy fpcentral --- tools/ansible/Makefile | 3 +++ tools/ansible/README | 5 +++++ tools/ansible/ansible-fpcentral.cfg | 2 ++ tools/ansible/fpcentral.yml | 4 ++++ tools/ansible/inventory | 3 +++ tools/ansible/roles/fpcentral/defaults/main.yml | 5 +++++ tools/ansible/roles/fpcentral/tasks/main.yml | 18 ++++++++++++++++++ tools/ansible/roles/fpcentral/templates/fpcentral.wsgi | 14 ++++++++++++++ 8 files changed, 54 insertions(+) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index eae73b5..608f932 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -1,2 +1,5 @@ ansible-tbb-build: ansible-playbook -i inventory tbb-build.yml + +fpcentral: + ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml diff --git a/tools/ansible/README b/tools/ansible/README index f631b08..6b2e6a4 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -11,3 +11,8 @@ ansible-tbb-build: Deploy changes to the machine used by Tor Browser team members to do some Tor Browser builds. +fpcentral: + Deploy fpcentral to forrestii.torproject.org. To be able to run this + you need to be in the fpcentral tpo ldap group. Your ldap password will + be asked, to sudo to the fpcentral user. + diff --git a/tools/ansible/ansible-fpcentral.cfg b/tools/ansible/ansible-fpcentral.cfg new file mode 100644 index 0000000..2ee3fb4 --- /dev/null +++ b/tools/ansible/ansible-fpcentral.cfg @@ -0,0 +1,2 @@ +[defaults] +allow_world_readable_tmpfiles=True diff --git a/tools/ansible/fpcentral.yml b/tools/ansible/fpcentral.yml new file mode 100644 index 0000000..80421a3 --- /dev/null +++ b/tools/ansible/fpcentral.yml @@ -0,0 +1,4 @@ +--- +- hosts: fpcentral + roles: + - role: fpcentral diff --git a/tools/ansible/inventory b/tools/ansible/inventory index e2597a0..32a5805 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,5 +1,8 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net +fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True [tbb-build] build-sunet-a +[fpcentral] +fpcentral diff --git a/tools/ansible/roles/fpcentral/defaults/main.yml b/tools/ansible/roles/fpcentral/defaults/main.yml new file mode 100644 index 0000000..e43b348 --- /dev/null +++ b/tools/ansible/roles/fpcentral/defaults/main.yml @@ -0,0 +1,5 @@ +--- +fpcentral_git_url: https://git.torproject.org/fpcentral.git +fpcentral_git_commit: fc8fc9113e5ee2f84ce30f0b8051772dd9d75447 +fpcentral_rootdir: /srv/fpcentral.tbb.torproject.org +fpcentral_virtualenv: "{{ fpcentral_rootdir }}/fpcentral-virtualenv" diff --git a/tools/ansible/roles/fpcentral/tasks/main.yml b/tools/ansible/roles/fpcentral/tasks/main.yml new file mode 100644 index 0000000..e5a4d2e --- /dev/null +++ b/tools/ansible/roles/fpcentral/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: clone fpcentral git repo + git: repo={{ fpcentral_git_url }} dest={{ fpcentral_rootdir }}/fpcentral + version={{ fpcentral_git_commit }} + +- name: create python3 virtual env + command: "python3 -mvirtualenv -p python3 {{ fpcentral_virtualenv }}" + args: + creates: "{{ fpcentral_virtualenv }}" + +- name: install required python modules + command: "{{ fpcentral_virtualenv }}/bin/pip3 install -r {{ fpcentral_rootdir }}/fpcentral/requirements.txt" + +- template: + src: fpcentral.wsgi + dest: "{{ fpcentral_rootdir }}/fpcentral/fpcentral.wsgi" + mode: 0755 + diff --git a/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi b/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi new file mode 100644 index 0000000..d4d7575 --- /dev/null +++ b/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi @@ -0,0 +1,14 @@ +activate_this = '{{ fpcentral_virtualenv }}/bin/activate_this.py' +with open(activate_this) as file_: + exec(file_.read(), dict(__file__=activate_this)) + +import sys +sys.path.insert(0, '{{ fpcentral_rootdir }}/fpcentral') +import os +os.chdir('{{ fpcentral_rootdir }}/fpcentral') +from run import app as application + +# we include the fpcentral commit as a comment, to make sure the +# fpcentral.wsgi file is modified when the commit is updated, causing +# the process to be restarted: +# {{ fpcentral_git_commit }}

1 0

[fpcentral/master] Bug 25060: set "Accept-Encoding" header expected value assuming we are using https
by boklm＠torproject.org 28 Jan '18

28 Jan '18

commit fc8fc9113e5ee2f84ce30f0b8051772dd9d75447 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Jan 28 22:21:08 2018 +0100 Bug 25060: set "Accept-Encoding" header expected value assuming we are using https --- fingerprint/acceptable/torbrowser70.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fingerprint/acceptable/torbrowser70.json b/fingerprint/acceptable/torbrowser70.json index 0f50c83..1664fe3 100644 --- a/fingerprint/acceptable/torbrowser70.json +++ b/fingerprint/acceptable/torbrowser70.json @@ -32,7 +32,7 @@ "timezone": 0, "cookies": "yes", "platform": "Win32", - "Accept-Encoding": "gzip, deflate", + "Accept-Encoding": "gzip, deflate, br", "Accept-Language": "en-US,en;q=0.5", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Content-Type": "",

1 0

[fpcentral/master] Bug 22587: add support for the automated_test argument
by boklm＠torproject.org 28 Jan '18

28 Jan '18

commit a27e401cc0995cd0205c8e995b0d370167cadf6e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Jan 28 19:53:38 2018 +0100 Bug 22587: add support for the automated_test argument If the /fp URL contains an `automated_test` argument, don't wait for the user to click the buttons to start the tests, but run them directly. This makes it easier to integrate fpcentral into our testsuite. --- static/js/clientAPI.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/js/clientAPI.js b/static/js/clientAPI.js index bf10164..498275d 100644 --- a/static/js/clientAPI.js +++ b/static/js/clientAPI.js @@ -178,6 +178,12 @@ $(document).ready(function() { localStorage.removeItem(sendTemp); localStorage.removeItem(statsTemp); } + + if (window.location.search.indexOf("automated_test") > -1) { + api.run(); + api.send(); + api.getNumberFP(); + } });

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 28 Jan '18

28 Jan '18

commit 40d2393b6434890bc08b2b7e102b29ef8e992a31 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 28 11:16:59 2018 +0000 Update translations for tor-launcher-network-settings_completed --- lv/network-settings.dtd | 63 ++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/lv/network-settings.dtd b/lv/network-settings.dtd index aeb6381fd..5c2de6743 100644 --- a/lv/network-settings.dtd +++ b/lv/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor tīkla iestatījumi"> +<!ENTITY torsettings.wizard.title.default "Veidot savienojumu ar Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor tīkla iestatījumi"> +<!ENTITY torsettings.wizard.title.connecting "Veido savienojumu">  <!ENTITY torlauncher.localePicker.title "Pārlūka Tor valoda"> @@ -6,44 +9,25 @@  -<!ENTITY torsettings.prompt "Pirms pievienojaties pie tīkla Tor, Jums jānorāda informācija par šī datora interneta savienojumu."> - -<!ENTITY torSettings.yes "Jā"> -<!ENTITY torSettings.no "Nē"> - -<!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> -<!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> -<!ENTITY torSettings.configurePrompt2 "Man jānokonfigurē tiltu vai vietējo starpniekserveru iestatījumi pirms es izveidoju savienojumu ar tīklu Tor ."> +<!ENTITY torSettings.connectPrompt "Klikšķināt „Savienot”, lai izveidotu savienojumu ar Tor."> +<!ENTITY torSettings.configurePrompt "Klikšķināt „Konfigurēt”, lai pielāgotu tīkla iestatījumus, ja esat valstīs, kas cenzē Tor (tādās, kā Ēģipte, Ķīna, Turcija), vai veidojat savienojumu no privāta tīkla, kam nepeciešams starpniekserveris."> <!ENTITY torSettings.configure "Konfigurēt"> -<!ENTITY torSettings.connectPrompt2 "Es vēlos izveidot tiešu savienojumu ar tīklu Tor."> -<!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> <!ENTITY torSettings.connect "Veidot savienojumu"> -<!ENTITY torSettings.proxyPageTitle "Lokālā starpniekservera konfigurēšana"> -<!ENTITY torSettings.proxyQuestion "Vai šim datoram jāizmanto lokālais starpniekserveris, lai piekļūtu internetam?"> - -<!ENTITY torSettings.proxyExplanation1 "Vairumā gadījumu nav nepieciešams vietējais starpniekserveris, bet tas var būt nepieciešams, ja savienojumu veido caur uzņēmuma, skolas vai universitātes tīklu."> -<!ENTITY torSettings.proxyExplanation2 "Ja īsti nezināt kā atbildēt uz šo jautājumu, ieskatieties cita pārlūka interneta iestatījumos vai pārbaudiet Jūsu sistēmas tīkla iestatījumus, lai redzētu vai ir nepieciešams vietējais starpniekserveris. "> -<!ENTITY torSettings.enterProxy "Ievadiet starpnieka iestatījumus."> -<!ENTITY torSettings.bridgePageTitle "Tor tiltu konfigurēšana"> -<!ENTITY torSettings.bridgeQuestion "Vai Jūsu interneta pakalpojumu sniedzējs (ISP) bloķē vai savādāk cenzē savienojumus ar tīklu Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Ja īsti nezināt kā atbildēt uz šo jautājumu, izvēlieties Nē (ja bez tilta nevarat izveidot savienojumu ar tīklu Tor, varēsit tiltu pievienot vēlāk)."> -<!ENTITY torSettings.bridgeExplanation2 "Ja izvēlēsities Jā, Jums lūgs konfigurēt Tor tiltus, kas ir sarakstos neiekļauti retranslatori, kas padara grūtāku savienojumu bloķēšanu ar tīklu Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Jūs varat izmantot piedāvāto tiltu kopumu vai varat ievadīt tiltu pielāgotu sarakstu. "> -  <!ENTITY torsettings.startingTor "Gaida, kamēr Tor startēs..."> <!ENTITY torsettings.restartTor "Restartēt Tor"> <!ENTITY torsettings.reconfigTor "Pārkonfigurēt"> -<!ENTITY torsettings.discardSettings.prompt "Jūs nokonfigurējāt Tor tiltus vai ievadījāt vietējā starpniekservera iestatījumus.  lai izveidot tiešu savienojumu ar tīklu Tor, šie iestatījumi ir jānoņem."> +<!ENTITY torsettings.discardSettings.prompt "Jūs nokonfigurējāt Tor tiltus vai ievadījāt vietējā starpniekservera iestatījumus. Lai izveidot tiešu savienojumu ar tīklu Tor, šie iestatījumi ir jānoņem."> <!ENTITY torsettings.discardSettings.proceed "Noņemt Iestatījumus un Izveidot savienojumu "> <!ENTITY torsettings.optional "Neobligāts"> -<!ENTITY torsettings.useProxy.checkbox "Šajā datorā interneta piekļuvei ir jāizmanto lokālais starpniekserveris."> +<!ENTITY torsettings.useProxy.checkbox "Lai izveidotu savienojumu ar internetu, es lietoju starpniekseveri"> <!ENTITY torsettings.useProxy.type "Starpnieka tips:"> +<!ENTITY torsettings.useProxy.type.placeholder "izvēlieties starpniekservera veidu"> <!ENTITY torsettings.useProxy.address "Adrese:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums"> <!ENTITY torsettings.useProxy.port "Ports:"> @@ -54,22 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Šis dators iet caur ugunsmūri, kurš atļauj tikai savienojumus ar noteiktiem portiem."> <!ENTITY torsettings.firewall.allowedPorts "Atļautie porti:"> -<!ENTITY torsettings.useBridges.checkbox "Mans interneta pakalpojumu sniedzējs (IPS) bloķē savienojumu izveidošanu ar tīklu Tor"> -<!ENTITY torsettings.useBridges.default "Veidot savienojumu ar piedāvātajiem tiltiem"> -<!ENTITY torsettings.useBridges.note "Katrs tilta veids lieto citu cenzūras apiešanas metodi.  ja kāds tilts nestrādā, mēģiniet vēlreiz ar citu."> -<!ENTITY torsettings.useBridges.type "Transporta veids:"> -<!ENTITY torsettings.useBridges.custom "Ievadiet pielāgotus tiltus"> -<!ENTITY torsettings.useBridges.label "Ievadiet vienu vai vairākus tilta retranslatorus (vienu rindā)."> -<!ENTITY torsettings.useBridges.placeholder "rakstīt address:port"> +<!ENTITY torsettings.useBridges.checkbox "Manā valstī Tor tiek cenzēts"> +<!ENTITY torsettings.useBridges.default "Izvēlieties iebūvētu tiltu"> +<!ENTITY torsettings.useBridges.default.placeholder "izvēlieties tiltu"> +<!ENTITY torsettings.useBridges.custom "Piedāvāt tiltu, kuru es zinu"> +<!ENTITY torsettings.useBridges.label "Ievadiet uzticama avota sniegtu tilta informāciju."> +<!ENTITY torsettings.useBridges.placeholder "rakstiet address:port (vienu rindā)"> <!ENTITY torsettings.copyLog "Kopēt Tor žurnālu starpliktuvē"> + +<!ENTITY torsettings.proxyHelpTitle "Starpniekservera palīdzība"> +<!ENTITY torsettings.proxyHelp1 "Ja veidojat savienojumu caur uzņēmuma, skolas vai universitātes tīklu, ir nepieciešams vietējais starpniekserveris. Ja neesat pārliecināts, kā atbildēt uz šo jautājumu, apskatiet interneta iestatījumus citā pārlūkā vai pārbaudiet savas sistēmas tīkla iestatījumus, lai noskaidrotu vai starpniekserveris ir nepieciešams."> + <!ENTITY torsettings.bridgeHelpTitle "Palīdzība par tiltu retranslatoriem"> -<!ENTITY torsettings.bridgeHelp1 "Ja nevarat izveidot savienojumu ar tīklu Tor, tad, iespējams, ka Jūsu interneta pakalpojumu sniedzējs (ISP) vai cita iestāde bloķē Tor.  Bieži, šo problemu var apiet izmantojot Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kurus grūtāk bloķēt."> -<!ENTITY torsettings.bridgeHelp1B "Jūs varat izmantot piedāvāto, iepriekš nokonfigurēto tiltu adrešu kopumu vai varat saņemt pielāgotu adrešu kopumu, lietojot kādu no šīm metodēm:"> -<!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> -<!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu, lai apmeklētu https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Sūtiet e-pastu uz bridges(a)torproject.org ar rindu 'get bridges' ziņojuma tekstā.  Taču, lai uzbrucējam būtu sarežģītāk uzzināt daudz tiltu adrešu, Jums jāsūta šis pieprasījums no kāda no šo e-pasta pakalpojumu sniedzēju e-pastiem (uzskaitītiem vēlamās izvēles kārtībā):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> -<!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> +<!ENTITY torsettings.bridgeHelp1 "Tilti ir neuzskaitīti pārraidītāji, kas padara sareģītāku savienojumu bloķēšanu ar tīklu Tor. Katrs tiltu veids lieto citu cenzūras apiešanas metodi. obfs jeb maskējošie padara Jūsu datu plūsmu līdzīgu nejaušam troksnim, bet meek jeb pielaidīgie padara Jūsu datu plūsmu līdzīgu tādai, kas pievienojas attiecīgajam pkalpojumam nevis Tor."> +<!ENTITY torsettings.bridgeHelp2 "Tā kā dažās valstīs cenšas atšķirīgi bloķēt tīklu Tor, daži tilti strādā vienās valstīs, bet nestrādā citās. Ja neesat pārliecināts, par to, kuri tilti strādā Jūsu valstī, skatiet torproject.org/about/contact.html#support"> + + +<!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor. Tam var būt nepieciešamas vairākas minūtes.">

1 0