October 2020 - tor-commits - lists.torproject.org

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 22 Oct '20

22 Oct '20

commit 69bf18a330f92473f1fd49ff6935ee2a1a3ab31c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 22:45:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fi.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fi.po b/fi.po index 1760328e8e..7887b8ad6c 100644 --- a/fi.po +++ b/fi.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-18 11:26+0200\n" -"PO-Revision-Date: 2020-10-22 22:15+0000\n" +"PO-Revision-Date: 2020-10-22 22:27+0000\n" "Last-Translator: Mikko Päivärinta <paivarinta.mikko.o(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -1372,7 +1372,7 @@ msgstr "Asenna kertaalleen" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 msgid "The configuration of your additional software failed." -msgstr "" +msgstr "Lisäohjelmistosi määrittely epäonnistui." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322 msgid "" @@ -1393,7 +1393,7 @@ msgstr "Pysyvän tallennustilan luonti epäonnistui." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:342 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" -msgstr "" +msgstr "Voit asentaa {packages} automaattisesti, kun käynnistät Tailsin" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345 msgid "To do so, you need to run Tails from a USB stick." @@ -1471,7 +1471,7 @@ msgstr "Poisto epäonnistui: {pkg}" #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122 msgid "Failed to read additional software configuration" -msgstr "Lisäohjelmistorakenteen luku epäonnistui" +msgstr "Lisäohjelmistomääritelmän luku epäonnistui" #. Translators: Don't translate {package}, it's a placeholder and will be #. replaced. @@ -1485,7 +1485,7 @@ msgid "" "To do so, install some software using <a href=\"synaptic.desktop\">Synaptic " "Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the " "command line</a>." -msgstr "" +msgstr "Jos haluat tehdä niin, asenna ohjelmistoja käyttäen <a href=\"synaptic.desktop\">Synaptic Package Manageria</a> tai <a href=\"org.gnome.Terminal.desktop\">APTta komentorivillä</a>." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:187 msgid "" @@ -1493,14 +1493,14 @@ msgid "" "some software using <a href=\"synaptic.desktop\">Synaptic Package " "Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command " "line</a>." -msgstr "" +msgstr "Jos haluat tehdä niin, avaa pysyvä tallennustilasi, kun käynnistät Tailsin, ja asenna ohjelmistoja käyttämällä <a href=\"synaptic.desktop\">Synaptic Package Manageria</a> tai <a href=\"org.gnome.Terminal.desktop\">APTta komentorivillä</a>." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:197 msgid "" "To do so, create a persistent storage and install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " "href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." -msgstr "" +msgstr "Jos haluat tehdä niin, luo pysyvä tallennustila ja asenna ohjelmistoja käyttämällä <a href=\"synaptic.desktop\">Synaptic Package Manageria</a> tai <a href=\"org.gnome.Terminal.desktop\">APTta komentorivillä</a>." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:205 msgid "" @@ -1654,21 +1654,21 @@ msgstr "{partition_name} ({partition_size})" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74 #, python-brace-format msgid "{volume_size} Volume" -msgstr "" +msgstr "{volume_size} Taltio" #. Translators: Don't translate {volume_name}, it's a placeholder and #. will be replaced. #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113 #, python-brace-format msgid "{volume_name} (Read-Only)" -msgstr "" +msgstr "{volume_name} (Vain luku)" #. Translators: Don't translate {partition_name} and {container_path}, they #. are placeholders and will be replaced. #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121 #, python-brace-format msgid "{partition_name} in {container_path}" -msgstr "" +msgstr "{partition_name} kohteessa {container_path}" #. Translators: Don't translate {volume_name} and {path_to_file_container}, #. they are placeholders and will be replaced. You should only have to @@ -1684,7 +1684,7 @@ msgstr "{volume_name} – {path_to_file_container}" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134 #, python-brace-format msgid "{partition_name} on {drive_name}" -msgstr "" +msgstr "{partition_name} kohteessa {drive-name}" #. Translators: Don't translate {volume_name} and {drive_name}, #. they are placeholders and will be replaced. You should only have to @@ -1697,7 +1697,7 @@ msgstr "{volume_name} – {drive_name}" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229 msgid "Wrong passphrase or parameters" -msgstr "" +msgstr "Väärä salasana tai säätöarvo" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231 msgid "Error unlocking volume" @@ -1749,7 +1749,7 @@ msgstr "Säilö on jo lisätty" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115 #, python-format msgid "The file container %s should already be listed." -msgstr "" +msgstr "Tiedostosäiliön %s pitäisi olla jo listattuna." #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131 msgid "Container opened read-only" @@ -1762,7 +1762,7 @@ msgstr "Säilö avattu vain luku-tilassa" msgid "" "The file container {path} could not be opened with write access. It was opened read-only instead. You will not be able to modify the content of the container.\n" "{error_message}" -msgstr "" +msgstr "Tiedostosäiliötä {path} ei voitu avata kirjoitusluvalla. Se avattiin sen sijaan vain luettavassa muodossa. Et voi muokata tämän säiliön sisältöä.\n{error_message}" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138 msgid "Error opening file" @@ -2089,7 +2089,7 @@ msgstr "Poista toinen ohjelmistopaketti" msgid "" "Authentication is required to remove a package from your additional software" " ($(command_line))" -msgstr "" +msgstr "Paketin poistamiseen lisäohjelmistostasi tarvitaan todennus ($(command_line))" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56 @@ -2256,7 +2256,7 @@ msgstr "Osiot ja asemat" msgid "" "This application is not affiliated with or endorsed by the VeraCrypt project" " or IDRIX." -msgstr "" +msgstr "Tällä sovelluksella ei ole siteitä VeraCrypt-projektiin tai IDRIXin eikä niiden tukea." #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29 msgid "_Open" @@ -2272,7 +2272,7 @@ msgstr "_Avaa lukitus" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61 msgid "Detach this volume" -msgstr "" +msgstr "Irrota tämä taltio" #: ../config/chroot_local-includes/usr/share/tails-installer/tails-installer.ui.in:265 msgid "Target USB stick:"

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 22 Oct '20

22 Oct '20

commit 32c851329fc97582dc27e8f907a0435ac07fa107 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 22:45:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- fi/torbrowser_strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/fi/torbrowser_strings.xml b/fi/torbrowser_strings.xml index 88232cbeb3..352e6768b3 100644 --- a/fi/torbrowser_strings.xml +++ b/fi/torbrowser_strings.xml @@ -39,6 +39,7 @@ <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake">snowflake</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Tarjoa tuntemani silta</string> <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Syötä luotettavasta lähteestä saatu siltatieto</string> <string name="preferences_tor_network_settings_bridge_config_current_bridge">Nykyinen määritetty silta: %s</string> <string name="tor_network_settings_bridge_not_configured">Ei määritetty</string>

1 0

[tor-browser-build/master] Bug 40125: Fold in fenix-*rust and fenix-cbindgen projects
by sysrqb＠torproject.org 22 Oct '20

22 Oct '20

commit 1e88b1aeda67811065a87cfa6441fa6224abcef6 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 18 07:16:00 2020 +0000 Bug 40125: Fold in fenix-*rust and fenix-cbindgen projects --- projects/application-services/build | 2 +- projects/application-services/config | 8 +- projects/cbindgen/config | 17 +- projects/fenix-as-rust/build | 65 ------ projects/fenix-as-rust/config | 103 --------- projects/fenix-as-rust/unwind.patch | 162 ------------- projects/fenix-cbindgen/build | 32 --- projects/fenix-cbindgen/config | 16 -- projects/fenix-rust/43909.patch | 252 --------------------- projects/fenix-rust/build | 65 ------ projects/fenix-rust/config | 103 --------- projects/fenix-rust/unwind.patch | 162 ------------- projects/geckoview/build | 2 +- projects/geckoview/config | 4 +- .../43909.patch => rust/43909_145.patch} | 0 projects/rust/build | 6 +- projects/rust/config | 40 ++-- 17 files changed, 41 insertions(+), 998 deletions(-) diff --git a/projects/application-services/build b/projects/application-services/build index 55ec519..9fb0f50 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -17,7 +17,7 @@ cd /var/tmp/dist tar -xf $rootdir/[% c('input_files_by_name/sqlcipher-' _ arch) %] mv sqlcipher sqlcipher-[% arch %] [% END -%] -export PATH=/var/tmp/dist/fenix-as-rust/bin:$PATH +export PATH=/var/tmp/dist/rust/bin:$PATH cd $rootdir # application-services uses a newer NDK, 21, than everything else... diff --git a/projects/application-services/config b/projects/application-services/config index d877002..68dc794 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -24,19 +24,19 @@ input_files: - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' # We need the torbrowser-* targets for Rust, see: #40094. - - project: fenix-as-rust + - project: rust name: rust-armv7 target_prepend: - torbrowser-android-armv7 - - project: fenix-as-rust + - project: rust name: rust-aarch64 target_prepend: - torbrowser-android-aarch64 - - project: fenix-as-rust + - project: rust name: rust-x86 target_prepend: - torbrowser-android-x86 - - project: fenix-as-rust + - project: rust name: rust-x86_64 target_prepend: - torbrowser-android-x86_64 diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 3dd94f6..1258b4f 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -1,16 +1,27 @@ # vim: filetype=yaml sw=2 -version: 0.14.1 +version: '[% c("var/cbindgen_version") %]' git_url: https://github.com/eqrion/cbindgen -git_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002 # v0.14.1 +git_hash: '[% c("var/cbindgen_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: + cbindgen_version: 0.14.1 + cbindgen_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002 + cbindgen_vendor_hash: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc container: use_container: 1 + +targets: + android: + var: + cbindgen_version: 0.14.3 + cbindgen_hash: cc2876f709808a52d132a5f84e53ca1964eb92db + cbindgen_vendor_hash: cc47db55a1c937e7bcd1cbd8664964656a4922bc35175d95c4015d452f2dcb2b + input_files: - project: container-image - name: rust project: rust # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 - sha256sum: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc + sha256sum: '[% c("var/cbindgen_vendor_hash") %]' diff --git a/projects/fenix-as-rust/build b/projects/fenix-as-rust/build deleted file mode 100644 index 5d3d5c1..0000000 --- a/projects/fenix-as-rust/build +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -export PATH="/var/tmp/dist/cmake/bin:$PATH" -tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] -cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu -./install.sh --prefix=$distdir-rust-old -export PATH="$distdir-rust-old/bin:$PATH" - -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -[% IF c("var/osx") %] - # We need to clear `CC` and `LDFLAGS` as they are used for the host platform - # (i.e. Linux). - unset CC - unset LDFLAGS - - mkdir $distdir/helper - # We need to adapt our CFLAGS and make sure our flags are passed down to all - # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort - # to a wrapper script. - cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' -#!/bin/sh -BASEDIR=/var/tmp/dist/macosx-toolchain -$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" -EOF - - chmod +x $distdir/helper/x86_64-apple-darwin-clang - export PATH=$distdir/helper:$PATH -[% END %] - -cd $rootdir -mkdir /var/tmp/build -tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] -cd /var/tmp/build/rustc-[% c('version') %]-src - -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -cd src/llvm-project -patch -p1 < $rootdir/43909.patch -cd ../../ - -[% IF c("var/windows-i686") %] - # Cross-compiling for Windows 32bit is currently not possible without any - # patches. The reason for that is libstd expecting DWARF unwinding while most - # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. - # See: https://github.com/rust-lang/rust/issues/12859 for discussion about - # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to - # fix this problem. We apply the patch from neersighted. - patch -p1 < $rootdir/unwind.patch -[% END %] - -mkdir build -cd build -../configure --prefix=$distdir [% c("var/configure_opt") %] - -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fenix-as-rust/config b/projects/fenix-as-rust/config deleted file mode 100644 index 4a4ae3c..0000000 --- a/projects/fenix-as-rust/config +++ /dev/null @@ -1,103 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: '[% c("input_file_var/rust_version") %]' - -# Those values can be changed from the input_files section of other -# projects. See bug 32436. -input_file_var: - rust_version: 1.45.2 - prev_version: 1.44.1 - -var: - prev_version: '[% c("input_file_var/prev_version") %]' - container: - use_container: 1 - -targets: - android: - var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("var/cross_prefix") %] --set=target.[% c("var/cross_prefix") %].cc=[% c("var/CC") %] --set=target.[% c("var/cross_prefix") %].ar=[% c("var/cross_prefix") %]-ar - - android-armv7: - var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].cc=[% c("var/CC") %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].ar=[% c("var/cross_prefix") %]-ar - - linux: - var: - deps: - - libc6-dev-i386 - - lib32stdc++6 - - build-essential - - python - - automake - - libssl-dev - - pkg-config - - hardening-wrapper - # We use - # `--enable-local-rust` to avoid downloading the required compiler during - # build time - # - # `--enable-vendor` to avoid downloading crates during build time and just - # use the ones which are shipped with the source - # - # `--enable-extended` to build not only rustc but cargo as well - # - # `--enable-llvm-static-stdccp` to take a libstdc++ on Jessie into account - # which is too old and if used gives undefined reference errors - # - # `--release-channel=stable` to just include stable features in the - # compiler - # - # `--sysconfdir=etc` to avoid install failures as |make install| wants to - # write to /etc otherwise - # - # the `target` triple to explicitly specify the architecture and platform - # for the compiler/std lib. Ideally, it should not be needed unless one is - # cross-compiling, but compiling `alloc_jemalloc` fails without that in a - # 32bit container. "--host=x86_64-unknown-linux-gnu" is used in its - # configure script in this case. - # `--set=` to explicitly specify the C compiler. We need to compile the - # bundled LLVM and it wants to use `cc`. However, we don't have that in - # our compiled GCC resulting in weird errors due to C and C++ compiler - # version mismatch. We avoid that with this configure option. - configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc - - osx-x86_64: - var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang - - windows: - var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu - -input_files: - - project: container-image - - project: cmake - name: cmake - - project: '[% c("var/compiler") %]' - name: '[% c("var/compiler") %]' - - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' - name: rust - sig_ext: asc - file_gpg_id: 1 - gpg_keyring: rust.gpg - - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' - name: prev_rust - sig_ext: asc - file_gpg_id: 1 - gpg_keyring: rust.gpg - - filename: unwind.patch - enable: '[% c("var/windows-i686") %]' - - filename: 43909.patch diff --git a/projects/fenix-as-rust/unwind.patch b/projects/fenix-as-rust/unwind.patch deleted file mode 100644 index 7b22dcb..0000000 --- a/projects/fenix-as-rust/unwind.patch +++ /dev/null @@ -1,162 +0,0 @@ -From b3bea7008ece7a5bdf9b5a5dcc95e82febad1854 Mon Sep 17 00:00:00 2001 -From: Bjorn Neergaard <bjorn(a)neersighted.com> -Date: Sat, 9 Feb 2019 19:39:23 +0000 -Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux - -This is still very rough and serves as a proof-of-concept for fixing -Linux -> 32-bit MinGW cross compilation workflow. Currently, clang and -GCC's MinGW targets both only support DW2 (DWARF) or SJLJ (Set Jump Long -Jump) unwinding on 32-bit Windows. - -The default for GCC (and the way it is shipped on every major distro) is -to use SJLJ on Windows, as DWARF cannot traverse non-DWARF frames. This -would work fine, except for the fact that libgcc (our C runtime on the -MinGW platform) exports symbols under a different name when configured -to use SJLJ-style unwinding, and uses a preprocessor macro internally to -alias them. - -Because of this, we have to detect this scenario and link to the correct -symbols ourselves. Linking has been tested with a full bootstrap on both -x86_64-unknown-linux-gnu and i686-pc-windows-gnu, as well as -cross-compilation of some of my own projects. - -Obviously, the detection is a bit unrefined. Right now we -unconditionally use SJLJ when compiling Linux -> MinGW. I'd like to add -feature detection using compiler build flags or autotools-style -compilation and object analysis. Input on the best way to proceed here -is welcome. - -Also, currently there is copy-pasted/duplicated code in libunwind. -Ideally, this could be reduced, but this would likely require a -rethinking of how iOS is special-cased above, to avoid further -duplication. Input on how to best structure this file is requested. - -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index 249a183189..df08d6eb0c 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -162,7 +162,12 @@ pub fn std_cargo(builder: &Builder<'_>, - .arg("--features") - .arg("compiler-builtins-mem"); - } else { -- let features = builder.std_features(); -+ let mut features = builder.std_features(); -+ -+ // FIXME: Temporary detection of SJLJ MinGW compilers. -+ if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" { -+ features.push_str(" sjlj_eh"); -+ } - - if compiler.stage != 0 && builder.config.sanitizers { - // This variable is used by the sanitizer runtime crates, e.g. -diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml -index 7d60a17042..d876d0b89a 100644 ---- a/src/libstd/Cargo.toml -+++ b/src/libstd/Cargo.toml -@@ -71,3 +71,4 @@ wasm-bindgen-threads = [] - # https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/… - std_detect_file_io = [] - std_detect_dlsym_getauxval = [] -+sjlj_eh = ["unwind/sjlj_eh"] -diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml -index 2378b0a315..0b5979ed62 100644 ---- a/src/libunwind/Cargo.toml -+++ b/src/libunwind/Cargo.toml -@@ -16,3 +16,6 @@ doc = false - core = { path = "../libcore" } - libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false } - compiler_builtins = "0.1.0" -+ -+[features] -+sjlj_eh = [] -diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs -index 339b554ed6..ec2f93ed60 100644 ---- a/src/libunwind/libunwind.rs -+++ b/src/libunwind/libunwind.rs -@@ -1,10 +1,5 @@ - #![allow(nonstandard_style)] - --macro_rules! cfg_if { -- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => -- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* ) --} -- - use libc::{c_int, c_void, uintptr_t}; - - #[repr(C)] -@@ -73,8 +68,8 @@ pub enum _Unwind_Context {} - pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, - exception: *mut _Unwind_Exception); - extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] - pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); - pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; - pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; -@@ -206,26 +201,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm - pc - } - } -+} // cfg_if! - --if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { -- // Not 32-bit iOS -+cfg_if! { -+if #[cfg(all(target_os = "ios", target_arch = "arm"))] { -+ // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() - extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ } -+ -+ #[inline] -+ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { -+ _Unwind_SjLj_RaiseException(exc) -+ } -+ -+} else if #[cfg(feature = "sjlj_eh")] { -+ extern "C" { -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; - pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, - trace_argument: *mut c_void) - -> _Unwind_Reason_Code; - } --} else { -- // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() -- extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ -+ #[inline] -+ pub unsafe fn _Unwind_Resume(exc: *mut _Unwind_Exception) -> ! { -+ _Unwind_SjLj_Resume(exc) - } - - #[inline] - pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { - _Unwind_SjLj_RaiseException(exc) - } -+} else { -+ extern "C" { -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, -+ trace_argument: *mut c_void) -+ -> _Unwind_Reason_Code; -+ } - } - } // cfg_if! --- -2.23.0.rc0 - diff --git a/projects/fenix-cbindgen/build b/projects/fenix-cbindgen/build deleted file mode 100644 index c63a783..0000000 --- a/projects/fenix-cbindgen/build +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist -builddir=/var/tmp/build/[% project %] -mkdir -p $distdir/[% project %] -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] -export PATH="/var/tmp/dist/fenix-rust/bin:$PATH" -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz - -# Now prepare the offline build -# Move the directory for hardcoding the path in .cargo/config -mv /var/tmp/build/[% project %]-[% c('version') %] $builddir -tar -C $builddir -xjf cbindgen-vendor-[% c('version') %].tar.bz2 -cd $builddir -mkdir .cargo -cat > .cargo/config << 'EOF' -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "/var/tmp/build/fenix-cbindgen/vendor" -EOF - -cargo build --release --frozen --target x86_64-unknown-linux-gnu -mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %] - -cd $distdir -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fenix-cbindgen/config b/projects/fenix-cbindgen/config deleted file mode 100644 index c081451..0000000 --- a/projects/fenix-cbindgen/config +++ /dev/null @@ -1,16 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.14.3 -git_url: https://github.com/eqrion/cbindgen -git_hash: cc2876f709808a52d132a5f84e53ca1964eb92db # v0.14.3 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 -input_files: - - project: container-image - - name: rust - project: fenix-rust - # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. - - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 - sha256sum: cc47db55a1c937e7bcd1cbd8664964656a4922bc35175d95c4015d452f2dcb2b diff --git a/projects/fenix-rust/43909.patch b/projects/fenix-rust/43909.patch deleted file mode 100644 index 78d2a75..0000000 --- a/projects/fenix-rust/43909.patch +++ /dev/null @@ -1,252 +0,0 @@ -From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 -From: Nikita Popov <nikita.ppv(a)gmail.com> -Date: Sat, 16 Nov 2019 16:22:18 +0100 -Subject: [PATCH] Restructure caching - -Variant on D70103. The caching is switched to always use a BB to -cache entry map, which then contains per-value caches. A separate -set contains value handles with a deletion callback. This allows us -to properly invalidate overdefined values. - -A possible alternative would be to always cache by value first and -have per-BB maps/sets in the each cache entry. In that case we could -use a ValueMap and would avoid the separate value handle set. I went -with the BB indexing at the top level to make it easier to integrate -D69914, but possibly that's not the right choice. - -Differential Revision: https://reviews.llvm.org/D70376 - -diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp -index 110c085d3f3..aa6862cb588 100644 ---- a/llvm/lib/Analysis/LazyValueInfo.cpp -+++ b/llvm/lib/Analysis/LazyValueInfo.cpp -@@ -133,12 +133,9 @@ namespace { - /// A callback value handle updates the cache when values are erased. - class LazyValueInfoCache; - struct LVIValueHandle final : public CallbackVH { -- // Needs to access getValPtr(), which is protected. -- friend struct DenseMapInfo<LVIValueHandle>; -- - LazyValueInfoCache *Parent; - -- LVIValueHandle(Value *V, LazyValueInfoCache *P) -+ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) - : CallbackVH(V), Parent(P) { } - - void deleted() override; -@@ -152,89 +149,63 @@ namespace { - /// This is the cache kept by LazyValueInfo which - /// maintains information about queries across the clients' queries. - class LazyValueInfoCache { -- /// This is all of the cached block information for exactly one Value*. -- /// The entries are sorted by the BasicBlock* of the -- /// entries, allowing us to do a lookup with a binary search. -- /// Over-defined lattice values are recorded in OverDefinedCache to reduce -- /// memory overhead. -- struct ValueCacheEntryTy { -- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} -- LVIValueHandle Handle; -- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; -+ /// This is all of the cached information for one basic block. It contains -+ /// the per-value lattice elements, as well as a separate set for -+ /// overdefined values to reduce memory usage. -+ struct BlockCacheEntryTy { -+ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; -+ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; - }; - -- /// This tracks, on a per-block basis, the set of values that are -- /// over-defined at the end of that block. -- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> -- OverDefinedCacheTy; -- /// Keep track of all blocks that we have ever seen, so we -- /// don't spend time removing unused blocks from our caches. -- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; -- -- /// This is all of the cached information for all values, -- /// mapped from Value* to key information. -- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; -- OverDefinedCacheTy OverDefinedCache; -- -+ /// Cached information per basic block. -+ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; -+ /// Set of value handles used to erase values from the cache on deletion. -+ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; - - public: - void insertResult(Value *Val, BasicBlock *BB, - const ValueLatticeElement &Result) { -- SeenBlocks.insert(BB); -- -+ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; - // Insert over-defined values into their own cache to reduce memory - // overhead. - if (Result.isOverdefined()) -- OverDefinedCache[BB].insert(Val); -- else { -- auto It = ValueCache.find_as(Val); -- if (It == ValueCache.end()) { -- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); -- It = ValueCache.find_as(Val); -- assert(It != ValueCache.end() && "Val was just added to the map!"); -- } -- It->second->BlockVals[BB] = Result; -- } -- } -- -- bool isOverdefined(Value *V, BasicBlock *BB) const { -- auto ODI = OverDefinedCache.find(BB); -- -- if (ODI == OverDefinedCache.end()) -- return false; -+ CacheEntry.OverDefined.insert(Val); -+ else -+ CacheEntry.LatticeElements.insert({ Val, Result }); - -- return ODI->second.count(V); -+ auto HandleIt = ValueHandles.find_as(Val); -+ if (HandleIt == ValueHandles.end()) -+ ValueHandles.insert({ Val, this }); - } - - bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { -- if (isOverdefined(V, BB)) -- return true; -- -- auto I = ValueCache.find_as(V); -- if (I == ValueCache.end()) -+ auto It = BlockCache.find(BB); -+ if (It == BlockCache.end()) - return false; - -- return I->second->BlockVals.count(BB); -+ return It->second.OverDefined.count(V) || -+ It->second.LatticeElements.count(V); - } - - ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { -- if (isOverdefined(V, BB)) -+ auto It = BlockCache.find(BB); -+ if (It == BlockCache.end()) -+ return ValueLatticeElement(); -+ -+ if (It->second.OverDefined.count(V)) - return ValueLatticeElement::getOverdefined(); - -- auto I = ValueCache.find_as(V); -- if (I == ValueCache.end()) -+ auto LatticeIt = It->second.LatticeElements.find(V); -+ if (LatticeIt == It->second.LatticeElements.end()) - return ValueLatticeElement(); -- auto BBI = I->second->BlockVals.find(BB); -- if (BBI == I->second->BlockVals.end()) -- return ValueLatticeElement(); -- return BBI->second; -+ -+ return LatticeIt->second; - } - - /// clear - Empty the cache. - void clear() { -- SeenBlocks.clear(); -- ValueCache.clear(); -- OverDefinedCache.clear(); -+ BlockCache.clear(); -+ ValueHandles.clear(); - } - - /// Inform the cache that a given value has been deleted. -@@ -248,23 +219,18 @@ namespace { - /// OldSucc might have (unless also overdefined in NewSucc). This just - /// flushes elements from the cache and does not add any. - void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); -- -- friend struct LVIValueHandle; - }; - } - - void LazyValueInfoCache::eraseValue(Value *V) { -- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { -- // Copy and increment the iterator immediately so we can erase behind -- // ourselves. -- auto Iter = I++; -- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; -- ValueSet.erase(V); -- if (ValueSet.empty()) -- OverDefinedCache.erase(Iter); -+ for (auto &Pair : BlockCache) { -+ Pair.second.LatticeElements.erase(V); -+ Pair.second.OverDefined.erase(V); - } - -- ValueCache.erase(V); -+ auto HandleIt = ValueHandles.find_as(V); -+ if (HandleIt != ValueHandles.end()) -+ ValueHandles.erase(HandleIt); - } - - void LVIValueHandle::deleted() { -@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { - } - - void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { -- // Shortcut if we have never seen this block. -- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); -- if (I == SeenBlocks.end()) -- return; -- SeenBlocks.erase(I); -- -- auto ODI = OverDefinedCache.find(BB); -- if (ODI != OverDefinedCache.end()) -- OverDefinedCache.erase(ODI); -- -- for (auto &I : ValueCache) -- I.second->BlockVals.erase(BB); -+ BlockCache.erase(BB); - } - - void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, -@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - std::vector<BasicBlock*> worklist; - worklist.push_back(OldSucc); - -- auto I = OverDefinedCache.find(OldSucc); -- if (I == OverDefinedCache.end()) -+ auto I = BlockCache.find(OldSucc); -+ if (I == BlockCache.end() || I->second.OverDefined.empty()) - return; // Nothing to process here. -- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); -+ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), -+ I->second.OverDefined.end()); - - // Use a worklist to perform a depth-first search of OldSucc's successors. - // NOTE: We do not need a visited list since any blocks we have already -@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - if (ToUpdate == NewSucc) continue; - - // If a value was marked overdefined in OldSucc, and is here too... -- auto OI = OverDefinedCache.find(ToUpdate); -- if (OI == OverDefinedCache.end()) -+ auto OI = BlockCache.find(ToUpdate); -+ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) - continue; -- SmallPtrSetImpl<Value *> &ValueSet = OI->second; -+ auto &ValueSet = OI->second.OverDefined; - - bool changed = false; - for (Value *V : ValsToClear) { -@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - // If we removed anything, then we potentially need to update - // blocks successors too. - changed = true; -- -- if (ValueSet.empty()) { -- OverDefinedCache.erase(OI); -- break; -- } - } - - if (!changed) continue; --- -2.24.0 - diff --git a/projects/fenix-rust/build b/projects/fenix-rust/build deleted file mode 100644 index 5d3d5c1..0000000 --- a/projects/fenix-rust/build +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -export PATH="/var/tmp/dist/cmake/bin:$PATH" -tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] -cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu -./install.sh --prefix=$distdir-rust-old -export PATH="$distdir-rust-old/bin:$PATH" - -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -[% IF c("var/osx") %] - # We need to clear `CC` and `LDFLAGS` as they are used for the host platform - # (i.e. Linux). - unset CC - unset LDFLAGS - - mkdir $distdir/helper - # We need to adapt our CFLAGS and make sure our flags are passed down to all - # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort - # to a wrapper script. - cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' -#!/bin/sh -BASEDIR=/var/tmp/dist/macosx-toolchain -$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" -EOF - - chmod +x $distdir/helper/x86_64-apple-darwin-clang - export PATH=$distdir/helper:$PATH -[% END %] - -cd $rootdir -mkdir /var/tmp/build -tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] -cd /var/tmp/build/rustc-[% c('version') %]-src - -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -cd src/llvm-project -patch -p1 < $rootdir/43909.patch -cd ../../ - -[% IF c("var/windows-i686") %] - # Cross-compiling for Windows 32bit is currently not possible without any - # patches. The reason for that is libstd expecting DWARF unwinding while most - # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. - # See: https://github.com/rust-lang/rust/issues/12859 for discussion about - # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to - # fix this problem. We apply the patch from neersighted. - patch -p1 < $rootdir/unwind.patch -[% END %] - -mkdir build -cd build -../configure --prefix=$distdir [% c("var/configure_opt") %] - -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fenix-rust/config b/projects/fenix-rust/config deleted file mode 100644 index 0f08463..0000000 --- a/projects/fenix-rust/config +++ /dev/null @@ -1,103 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: '[% c("input_file_var/rust_version") %]' - -# Those values can be changed from the input_files section of other -# projects. See bug 32436. -input_file_var: - rust_version: 1.43.0 - prev_version: 1.42.0 - -var: - prev_version: '[% c("input_file_var/prev_version") %]' - container: - use_container: 1 - -targets: - android: - var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("var/cross_prefix") %] --set=target.[% c("var/cross_prefix") %].cc=[% c("var/CC") %] --set=target.[% c("var/cross_prefix") %].ar=[% c("var/cross_prefix") %]-ar - - android-armv7: - var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].cc=[% c("var/CC") %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].ar=[% c("var/cross_prefix") %]-ar - - linux: - var: - deps: - - libc6-dev-i386 - - lib32stdc++6 - - build-essential - - python - - automake - - libssl-dev - - pkg-config - - hardening-wrapper - # We use - # `--enable-local-rust` to avoid downloading the required compiler during - # build time - # - # `--enable-vendor` to avoid downloading crates during build time and just - # use the ones which are shipped with the source - # - # `--enable-extended` to build not only rustc but cargo as well - # - # `--enable-llvm-static-stdccp` to take a libstdc++ on Jessie into account - # which is too old and if used gives undefined reference errors - # - # `--release-channel=stable` to just include stable features in the - # compiler - # - # `--sysconfdir=etc` to avoid install failures as |make install| wants to - # write to /etc otherwise - # - # the `target` triple to explicitly specify the architecture and platform - # for the compiler/std lib. Ideally, it should not be needed unless one is - # cross-compiling, but compiling `alloc_jemalloc` fails without that in a - # 32bit container. "--host=x86_64-unknown-linux-gnu" is used in its - # configure script in this case. - # `--set=` to explicitly specify the C compiler. We need to compile the - # bundled LLVM and it wants to use `cc`. However, we don't have that in - # our compiled GCC resulting in weird errors due to C and C++ compiler - # version mismatch. We avoid that with this configure option. - configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc - - osx-x86_64: - var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang - - windows: - var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu - -input_files: - - project: container-image - - project: cmake - name: cmake - - project: '[% c("var/compiler") %]' - name: '[% c("var/compiler") %]' - - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' - name: rust - sig_ext: asc - file_gpg_id: 1 - gpg_keyring: rust.gpg - - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' - name: prev_rust - sig_ext: asc - file_gpg_id: 1 - gpg_keyring: rust.gpg - - filename: unwind.patch - enable: '[% c("var/windows-i686") %]' - - filename: 43909.patch diff --git a/projects/fenix-rust/unwind.patch b/projects/fenix-rust/unwind.patch deleted file mode 100644 index 7b22dcb..0000000 --- a/projects/fenix-rust/unwind.patch +++ /dev/null @@ -1,162 +0,0 @@ -From b3bea7008ece7a5bdf9b5a5dcc95e82febad1854 Mon Sep 17 00:00:00 2001 -From: Bjorn Neergaard <bjorn(a)neersighted.com> -Date: Sat, 9 Feb 2019 19:39:23 +0000 -Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux - -This is still very rough and serves as a proof-of-concept for fixing -Linux -> 32-bit MinGW cross compilation workflow. Currently, clang and -GCC's MinGW targets both only support DW2 (DWARF) or SJLJ (Set Jump Long -Jump) unwinding on 32-bit Windows. - -The default for GCC (and the way it is shipped on every major distro) is -to use SJLJ on Windows, as DWARF cannot traverse non-DWARF frames. This -would work fine, except for the fact that libgcc (our C runtime on the -MinGW platform) exports symbols under a different name when configured -to use SJLJ-style unwinding, and uses a preprocessor macro internally to -alias them. - -Because of this, we have to detect this scenario and link to the correct -symbols ourselves. Linking has been tested with a full bootstrap on both -x86_64-unknown-linux-gnu and i686-pc-windows-gnu, as well as -cross-compilation of some of my own projects. - -Obviously, the detection is a bit unrefined. Right now we -unconditionally use SJLJ when compiling Linux -> MinGW. I'd like to add -feature detection using compiler build flags or autotools-style -compilation and object analysis. Input on the best way to proceed here -is welcome. - -Also, currently there is copy-pasted/duplicated code in libunwind. -Ideally, this could be reduced, but this would likely require a -rethinking of how iOS is special-cased above, to avoid further -duplication. Input on how to best structure this file is requested. - -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index 249a183189..df08d6eb0c 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -162,7 +162,12 @@ pub fn std_cargo(builder: &Builder<'_>, - .arg("--features") - .arg("compiler-builtins-mem"); - } else { -- let features = builder.std_features(); -+ let mut features = builder.std_features(); -+ -+ // FIXME: Temporary detection of SJLJ MinGW compilers. -+ if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" { -+ features.push_str(" sjlj_eh"); -+ } - - if compiler.stage != 0 && builder.config.sanitizers { - // This variable is used by the sanitizer runtime crates, e.g. -diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml -index 7d60a17042..d876d0b89a 100644 ---- a/src/libstd/Cargo.toml -+++ b/src/libstd/Cargo.toml -@@ -71,3 +71,4 @@ wasm-bindgen-threads = [] - # https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/… - std_detect_file_io = [] - std_detect_dlsym_getauxval = [] -+sjlj_eh = ["unwind/sjlj_eh"] -diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml -index 2378b0a315..0b5979ed62 100644 ---- a/src/libunwind/Cargo.toml -+++ b/src/libunwind/Cargo.toml -@@ -16,3 +16,6 @@ doc = false - core = { path = "../libcore" } - libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false } - compiler_builtins = "0.1.0" -+ -+[features] -+sjlj_eh = [] -diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs -index 339b554ed6..ec2f93ed60 100644 ---- a/src/libunwind/libunwind.rs -+++ b/src/libunwind/libunwind.rs -@@ -1,10 +1,5 @@ - #![allow(nonstandard_style)] - --macro_rules! cfg_if { -- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => -- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* ) --} -- - use libc::{c_int, c_void, uintptr_t}; - - #[repr(C)] -@@ -73,8 +68,8 @@ pub enum _Unwind_Context {} - pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, - exception: *mut _Unwind_Exception); - extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] - pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); - pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; - pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; -@@ -206,26 +201,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm - pc - } - } -+} // cfg_if! - --if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { -- // Not 32-bit iOS -+cfg_if! { -+if #[cfg(all(target_os = "ios", target_arch = "arm"))] { -+ // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() - extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ } -+ -+ #[inline] -+ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { -+ _Unwind_SjLj_RaiseException(exc) -+ } -+ -+} else if #[cfg(feature = "sjlj_eh")] { -+ extern "C" { -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; - pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, - trace_argument: *mut c_void) - -> _Unwind_Reason_Code; - } --} else { -- // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() -- extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ -+ #[inline] -+ pub unsafe fn _Unwind_Resume(exc: *mut _Unwind_Exception) -> ! { -+ _Unwind_SjLj_Resume(exc) - } - - #[inline] - pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { - _Unwind_SjLj_RaiseException(exc) - } -+} else { -+ extern "C" { -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, -+ trace_argument: *mut c_void) -+ -> _Unwind_Reason_Code; -+ } - } - } // cfg_if! --- -2.23.0.rc0 - diff --git a/projects/geckoview/build b/projects/geckoview/build index b07bd2b..8296856 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -20,7 +20,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/fenix-rust/bin:/var/tmp/dist/fenix-cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" +export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/geckoview/config b/projects/geckoview/config index 92d4a1b..c9eb23e 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -144,9 +144,9 @@ input_files: name: mozconfig - project: binutils name: binutils - - project: fenix-rust + - project: rust name: rust - - project: fenix-cbindgen + - project: cbindgen name: cbindgen - project: node name: node diff --git a/projects/fenix-as-rust/43909.patch b/projects/rust/43909_145.patch similarity index 100% rename from projects/fenix-as-rust/43909.patch rename to projects/rust/43909_145.patch diff --git a/projects/rust/build b/projects/rust/build index 5d3d5c1..8accf56 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -4,8 +4,8 @@ distdir=/var/tmp/dist/[% project %] mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" -tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] -cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu +tar -C /var/tmp/dist -xf [% c('input_files_by_name/previous_rust') %] +cd /var/tmp/dist/rust-[% c('var/previous_version') %]-x86_64-unknown-linux-gnu ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" @@ -39,7 +39,7 @@ cd /var/tmp/build/rustc-[% c('version') %]-src # LLVM has reproducibility issues when optimizing bitcode, which we need to # patch. See: #32053 for more details. cd src/llvm-project -patch -p1 < $rootdir/43909.patch +patch -p1 < $rootdir/[% c('input_files_by_name/43909') %] cd ../../ [% IF c("var/windows-i686") %] diff --git a/projects/rust/config b/projects/rust/config index af94f05..d4529c8 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,40 +1,27 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: '[% c("input_file_var/rust_version") %]' - -# Those values can be changed from the input_files section of other -# projects. See bug 32436. -input_file_var: - rust_version: 1.43.0 - prev_version: 1.42.0 +version: '[% c("var/current_version") %]' var: - prev_version: '[% c("input_file_var/prev_version") %]' + current_version: 1.43.0 + previous_version: 1.42.0 container: use_container: 1 targets: android: var: + current_version: '[% IF pc(c("origin_project"), "var/application_services") %]1.45.2[% ELSE %]1.43.0[% END %]' + previous_version: '[% IF pc(c("origin_project"), "var/application_services") %]1.44.1[% ELSE %]1.42.0[% END %]' arch_deps: - libssl-dev - pkg-config - zlib1g-dev - android-armv7: - var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=thumbv7neon-linux-androideabi --set=target.thumbv7neon-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc - - android-x86: - var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc - - android-x86_64: - var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-linux-android --set=target.x86_64-linux-android.cc=$ANDROID_NDK_HOME/x86_64/bin/x86_64-linux-android-gcc + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("var/cross_prefix") %] --set=target.[% c("var/cross_prefix") %].cc=[% c("var/CC") %] --set=target.[% c("var/cross_prefix") %].ar=[% c("var/cross_prefix") %]-ar - android-aarch64: + android-armv7: var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=aarch64-linux-android --set=target.aarch64-linux-android.cc=$ANDROID_NDK_HOME/arm64/bin/aarch64-linux-android-gcc + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].cc=[% c("var/CC") %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].ar=[% c("var/cross_prefix") %]-ar linux: var: @@ -98,16 +85,21 @@ input_files: name: cmake - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' - - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' + - URL: 'https://static.rust-lang.org/dist/rustc-[% c("var/current_version") %]-src.tar.gz' name: rust sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg - - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' - name: prev_rust + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/previous_version") %]-x86_64-unknown-linux-gnu.tar.xz' + name: previous_rust sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg - filename: unwind.patch enable: '[% c("var/windows-i686") %]' - filename: 43909.patch + name: 43909 + enable: '[% ! pc(c("origin_project"), "var/application_services") %]' + - filename: 43909_145.patch + name: 43909 + enable: '[% pc(c("origin_project"), "var/application_services") %]'

1 0

[tor-browser-build/master] Bug 40125: Merge clang and fenix-clang projects
by sysrqb＠torproject.org 22 Oct '20

22 Oct '20

commit bfd59379b6b0934cb4a0771e1a668e447a540971 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 18 07:17:14 2020 +0000 Bug 40125: Merge clang and fenix-clang projects --- projects/clang/build | 31 +++++++++++++++++++++---------- projects/clang/config | 14 ++++++++++++-- projects/fenix-clang/build | 34 ---------------------------------- projects/fenix-clang/config | 19 ------------------- projects/geckoview/build | 2 +- projects/geckoview/config | 2 +- projects/llvm-project/build | 4 ++-- 7 files changed, 37 insertions(+), 69 deletions(-) diff --git a/projects/clang/build b/projects/clang/build index 10700ce..c4c16d9 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -4,12 +4,14 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" -[% IF c("var/linux") %] - # We need a link to our GCC, otherwise the system cc gets used which points to - # /usr/bin/gcc. - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] - ln -s gcc /var/tmp/dist/gcc/bin/cc +[% IF c("var/linux") || c("var/android") %] + [% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points + # to /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc + [% END %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] @@ -20,10 +22,19 @@ cd clang-source export LLVM_HOME=$(pwd) mkdir build cd build -cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] - $LLVM_HOME +# XXX: remove duplicated parts while fixing tor-browser-build#40048 +[% IF ! c("var/android") %] + cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + $LLVM_HOME +[% ELSE %] + cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" +[% END -%] make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist diff --git a/projects/clang/config b/projects/clang/config index 46d308a..6038eab 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -1,11 +1,17 @@ # vim: filetype=yaml sw=2 -version: 9.0.1 +version: '[% c("var/llvm_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: + llvm_version: '[% pc("clang-source", "version") %]' container: use_container: 1 +targets: + android: + var: + llvm_version: '[% pc("llvm-project", "version") %]' + input_files: - project: container-image - name: '[% c("var/compiler") %]' @@ -13,8 +19,12 @@ input_files: enable: '[% c("var/linux") %]' - name: binutils project: binutils - enable: '[% c("var/linux") %]' + enable: '[% c("var/linux") %] || [% c("var/android") %]' - project: cmake name: cmake - project: clang-source name: clang-source + enable: '[% ! c("var/android") %]' + - project: llvm-project + name: clang-source + enable: '[% c("var/android") %]' diff --git a/projects/fenix-clang/build b/projects/fenix-clang/build deleted file mode 100644 index c3c15f1..0000000 --- a/projects/fenix-clang/build +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -export PATH="/var/tmp/dist/cmake/bin:$PATH" -[% IF c("var/linux") %] - # We need a link to our GCC, otherwise the system cc gets used which points to - # /usr/bin/gcc. - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] - ln -s gcc /var/tmp/dist/gcc/bin/cc -[% END -%] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" - -mkdir -p /var/tmp/build -cd /var/tmp/build -tar -xf $rootdir/[% c('input_files_by_name/llvm-project') %] -cd llvm-project -mkdir build -cd build -cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ - [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fenix-clang/config b/projects/fenix-clang/config deleted file mode 100644 index 4bc55f3..0000000 --- a/projects/fenix-clang/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% pc("llvm-project", "version") %]' -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/linux") %]' - - name: binutils - project: binutils - - project: cmake - name: cmake - - project: llvm-project - name: llvm-project diff --git a/projects/geckoview/build b/projects/geckoview/build index 8296856..1c6582c 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -20,7 +20,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" +export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH" tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/geckoview/config b/projects/geckoview/config index c9eb23e..36d1212 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -154,7 +154,7 @@ input_files: name: nasm - project: python name: python - - project: fenix-clang + - project: clang name: clang - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies diff --git a/projects/llvm-project/build b/projects/llvm-project/build index ac0f21b..e35adbf 100644 --- a/projects/llvm-project/build +++ b/projects/llvm-project/build @@ -1,8 +1,8 @@ #!/bin/bash [% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] +mv [% project %]-[% c("version") %] clang-source [% c('tar', { - tar_src => [ project ], + tar_src => [ 'clang-source' ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), }) %]

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 2 commits: Bug 40095: Hide "Sign in to sync" in bookmarks
by Matthew Finkel 22 Oct '20

22 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: d0ee6fe3 by Alex Catarineu at 2020-10-22T13:25:22+02:00 Bug 40095: Hide "Sign in to sync" in bookmarks - - - - - 8c969c0c by Matthew Finkel at 2020-10-22T22:18:33+00:00 Merge remote-tracking branch 'acatgl/40095' into tor-browser-82.0.0b4-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt ===================================== @@ -48,7 +48,6 @@ import org.mozilla.fenix.ext.bookmarkStorage import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.minus import org.mozilla.fenix.ext.nav -import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.toShortUrl import org.mozilla.fenix.library.LibraryPageFragment import org.mozilla.fenix.utils.allowUndo @@ -129,16 +128,9 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan @ExperimentalCoroutinesApi override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val accountManager = requireComponents.backgroundServices.accountManager consumeFrom(bookmarkStore) { bookmarkView.update(it) - - // Only display the sign-in prompt if we're inside of the virtual "Desktop Bookmarks" node. - // Don't want to pester user too much with it, and if there are lots of bookmarks present, - // it'll just get visually lost. Inside of the "Desktop Bookmarks" node, it'll nicely stand-out, - // since there are always only three other items in there. It's also the right place contextually. - bookmarkView.view.bookmark_folders_sign_in.isVisible = - it.tree?.guid == BookmarkRoot.Root.id && accountManager.authenticatedAccount() == null + bookmarkView.view.bookmark_folders_sign_in.isVisible = false } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/03b642acdc42… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/03b642acdc42… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
by translation＠torproject.org 22 Oct '20

22 Oct '20

commit ee2ba698e2fb71a434fb67b041a342dd33286f37 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 22:18:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal_comp… --- contents+tr.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index fd300e952d..5416e4b0e5 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -12003,6 +12003,11 @@ msgid "" " are evil — they attempt to strong-arm network administrators on policy, " "service, and routing issues, and then extract ransoms from victims." msgstr "" +"[Tor, spam göndermek için yararlı olmasa da](/abuse/what-about-spammers/), " +"bazı aşırı hevesli kara listeciler, Tor gibi tüm açık ağların kötü olduğunu " +"düşünüyor gibi görünüyor. Ağ yöneticilerine ilke, hizmet ve yönlendirme " +"konularında güçlü bir silah sağlamaya çalışarak kurbanlardan fidye " +"alıyorlar." #: https//support.torproject.org/abuse/nodes-banned-from-mail-server/ #: (content/abuse/mail-server-ban/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 22 Oct '20

22 Oct '20

commit b9b1837a793e1533bc15900187d577fe75cda436 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 22:18:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+tr.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index fd300e952d..5416e4b0e5 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -12003,6 +12003,11 @@ msgid "" " are evil — they attempt to strong-arm network administrators on policy, " "service, and routing issues, and then extract ransoms from victims." msgstr "" +"[Tor, spam göndermek için yararlı olmasa da](/abuse/what-about-spammers/), " +"bazı aşırı hevesli kara listeciler, Tor gibi tüm açık ağların kötü olduğunu " +"düşünüyor gibi görünüyor. Ağ yöneticilerine ilke, hizmet ve yönlendirme " +"konularında güçlü bir silah sağlamaya çalışarak kurbanlardan fidye " +"alıyorlar." #: https//support.torproject.org/abuse/nodes-banned-from-mail-server/ #: (content/abuse/mail-server-ban/contents+en.lrquestion.description)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 22 Oct '20

22 Oct '20

commit df53cb4467ab93b741a24d17ce08084b529abc38 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 22:16:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index 396afb423c..ba20301083 100644 --- a/fi.po +++ b/fi.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-18 11:26+0200\n" -"PO-Revision-Date: 2020-10-22 21:46+0000\n" +"PO-Revision-Date: 2020-10-22 22:16+0000\n" "Last-Translator: Mikko Päivärinta <paivarinta.mikko.o(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 22 Oct '20

22 Oct '20

commit 5b8d254455fb1892f49491ffddf54023dbd58a02 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 22:15:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fi.po | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/fi.po b/fi.po index 94ffe9f8d6..1760328e8e 100644 --- a/fi.po +++ b/fi.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-18 11:26+0200\n" -"PO-Revision-Date: 2020-10-22 21:45+0000\n" +"PO-Revision-Date: 2020-10-22 22:15+0000\n" "Last-Translator: Mikko Päivärinta <paivarinta.mikko.o(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -64,13 +64,13 @@ msgstr "Lisäohjelmistot" msgid "" "You can install additional software automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "Voit asentaa lisäohjelmistoa automaattisesti pysyvästä tallennustilastasi, kun käynnistät Tailsin." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77 msgid "" "The following software is installed automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "Seuraava ohjelmisto asennetaan automaattisesti pysyvästä tallennustilastasi, kun käynnistät Tailsin." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171 @@ -78,7 +78,7 @@ msgid "" "To add more, install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " "href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." -msgstr "" +msgstr "Jos haluat lisätä lisää, asenna ohjelmistoja käyttäen <a href=\"synaptic.desktop\">Synaptic Package Manageria</a> tai <a href=\"org.gnome.Terminal.desktop\">APTta komentorivillä</a>." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154 msgid "_Create persistent storage" @@ -1018,7 +1018,7 @@ msgstr "Valitse tiedostot, jotka tallennetaan pysyvään taltioon" msgid "" "The selected files will be stored in the encrypted partition {partition} " "({size}), on the {vendor} {model} device." -msgstr "" +msgstr "Valitut tiedostot säilytetään salatussa osiossa {partition} ({size}), laitteessa {vendor} {model}." #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:98 msgid "Save" @@ -1201,7 +1201,7 @@ msgstr "Pysyvä taltio ei ole luettavissa. Onko käyttöoikeus- tai omistajuuson #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:433 msgid "Persistence volume is not writable." -msgstr "" +msgstr "Pysyvään taltioon ei voi kirjoittaa." #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:442 msgid "Tails is running from non-USB / non-SDIO device." @@ -1209,7 +1209,7 @@ msgstr "" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:447 msgid "Device is optical." -msgstr "" +msgstr "Laite on optinen." #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:454 msgid "Device was not created using a USB image or Tails Installer." @@ -1318,13 +1318,13 @@ msgstr "ei saatavilla" msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." -msgstr "" +msgstr "{details} Ole hyvä ja tarkista lisäohjelmistolistasi tai lue järjestelmäloki ymmärtääksesi pulman paremmin." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." -msgstr "" +msgstr "Ole hyvä ja tarkista lisäohjelmistolistasi tai lue järjestelmäloki ymmärtääksesi pulman paremmin." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 msgid "Show Log" @@ -1357,7 +1357,7 @@ msgstr "Lisää {packages} lisäohjelmistoosi?" msgid "" "To install it automatically from your persistent storage when starting " "Tails." -msgstr "" +msgstr "Asentaaksesi sen automaattisesti pysyvästä tallennustilastasi, kun käynnistät Tailsin." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 msgid "Install Every Time" @@ -1378,15 +1378,15 @@ msgstr "" msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the Additional Software feature." -msgstr "" +msgstr "Asentaaksesi sen automaattisesti, kun käynnistät Tailsin, voit luoda pysyvän varastotilan ja aktivoida toiminnon Lisäohjelmisto." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 msgid "Create Persistent Storage" -msgstr "" +msgstr "Luo pysyvä tallennustila" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333 msgid "Creating your persistent storage failed." -msgstr "" +msgstr "Pysyvän tallennustilan luonti epäonnistui." #. Translators: Don't translate {packages}, it's a placeholder and #. will be replaced. @@ -1404,14 +1404,14 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359 #, python-brace-format msgid "Remove {packages} from your additional software?" -msgstr "" +msgstr "Poistetaanko {packages} lisäohjelmistostasi?" #. Translators: Don't translate {packages}, it's a placeholder #. and will be replaced. #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 #, python-brace-format msgid "This will stop installing {packages} automatically." -msgstr "" +msgstr "Tämä lopettaa {packages} asentamisen automaattisesti." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154 @@ -1420,7 +1420,7 @@ msgstr "Poista" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." -msgstr "" +msgstr "Lisäohjelmistoasi asennetaan pysyvästä tallennustilasta..." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." @@ -1428,26 +1428,26 @@ msgstr "Tämä saattaa kestää useita minuutteja." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559 msgid "The installation of your additional software failed" -msgstr "" +msgstr "Lisäohjelmistosi asennus epäonnistui" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574 msgid "Additional software installed successfully" -msgstr "" +msgstr "Lisäohjelmisto asennettu onnistuneesti" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594 msgid "The check for upgrades of your additional software failed" -msgstr "" +msgstr "Lisäohjelmiston päivitysten tarkistus epäonnistui" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." -msgstr "" +msgstr "Tarkista verkkoyhteytesi, käynnistä Tails uudelleen, tai lue järjestelmäloki ymmärtääksesi pulman paremmin." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" -msgstr "" +msgstr "Lisäohjelmistosi päivitys epäonnistui." #: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37 msgid "Documentation" @@ -1471,14 +1471,14 @@ msgstr "Poisto epäonnistui: {pkg}" #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122 msgid "Failed to read additional software configuration" -msgstr "" +msgstr "Lisäohjelmistorakenteen luku epäonnistui" #. Translators: Don't translate {package}, it's a placeholder and will be #. replaced. #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:152 #, python-brace-format msgid "Stop installing {package} automatically" -msgstr "" +msgstr "Lopeta {package} asennus automaattisesti" #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:178 msgid "" @@ -1535,7 +1535,7 @@ msgstr "Näytön lukitsija" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131 msgid "Set up a password to unlock the screen." -msgstr "" +msgstr "Aseta salasana avataksesi näyton." #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149 msgid "Password" @@ -2059,7 +2059,7 @@ msgstr "Liitä VeraCrypt-salattuja tiedostosäilöjä ja -laitteita" msgid "" "Configure the additional software installed from your persistent storage " "when starting Tails" -msgstr "" +msgstr "Määrittele pysyvästä tallennustilastasi asennettu lisäöhjelmisto, kun käynnistät Tailsin" #: ../config/chroot_local-includes/usr/share/applications/whisperback.desktop.in.h:1 msgid "WhisperBack Error Reporting"

1 0

[translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
by translation＠torproject.org 22 Oct '20

22 Oct '20

commit 87d857f0ec0bb6183efed3b12e6dd25aef3d78fb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 22:15:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- fi/exonerator.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fi/exonerator.properties b/fi/exonerator.properties index 6e8293fa94..913b3a9d19 100644 --- a/fi/exonerator.properties +++ b/fi/exonerator.properties @@ -19,8 +19,8 @@ summary.invalidparams.invalidip.title=Virheellinen IP-osoiteparametri summary.invalidparams.invalidip.body=IP-osoite %s ei ole kelvollinen. Odotetut IP-osoitemuodot ovat %s tai %s. summary.invalidparams.invalidtimestamp.title=Virheellinen päivämääräparametri summary.invalidparams.invalidtimestamp.body=Päivämäärä %s ei ole kelvollinen. Odotettu päivämäärämuoto on %s. -summary.invalidparams.timestamptoorecent.title=Date parameter too recent -summary.invalidparams.timestamptoorecent.body=The database may not yet contain enough data to correctly answer this request. The latest accepted data is the day before yesterday. Please repeat your search on another day. +summary.invalidparams.timestamptoorecent.title=Päivämääräarvo liian viimeaikainen +summary.invalidparams.timestamptoorecent.body=Tietokanta saattaa sisältää liian vähän tietoa tähän pyyntöön vastaamiseen. Viimeisin hyväksytty tieto on toissapäivältä. Ole hyvä ja toista hakusi jonain muuna päivänä. summary.serverproblem.nodata.title=Palvelinpulma summary.serverproblem.nodata.body.text=Tietokanta ei sisällä mitään tietoja pyydetyltä päivältä. Yritä myöhemmin uudelleen. Jos tämä pulma pysyy: %s! summary.serverproblem.nodata.body.link=anna meidän tietää @@ -43,11 +43,11 @@ technicaldetails.exit.yes=Kyllä technicaldetails.exit.no=Ei permanentlink.heading=Pysyvä linkki footer.abouttor.heading=Tietoa Tor-sovelluksesta -footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by encrypting packets and sending them through a series of hops before they reach their destination.  Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator.  The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin.  Be sure to %s, and don't hesitate to %s for more information. +footer.abouttor.body.text=Tor on kansainvälinen ohjelmistoprojekti, joka anonymisoi Internet-liikennettä salaamalla paketteja ja lähettämällä ne päämääräänsä usean perättäisen hypyn kautta. Jos siis näet liikennettä Tor-välityspalvelimesta, tämä liikenne on tavallisesti lähtöisin joltakin Tor-käyttäjältä eikä välitysoperaattorilta. Tor-projektilla ja Tor-välityspalvelinoperaattoreilla ei ole verkon kautta kulkevasta liikenteestä tietoja eivätkä he siksi voi tarjota mitään tietoa sen alkuperästä.  Muista %s äläkä epäröi %s lisätietoja varten. footer.abouttor.body.link1=opi lisää Torista footer.abouttor.body.link2=ota yhteys: The Tor Project, Inc. footer.aboutexonerator.heading=Tietoa ExoneraTorista -footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP addresses that have been part of the Tor network.  It answers the question whether there was a Tor relay running on a given IP address on a given date.  ExoneraTor may store more than one IP address per relay if relays use a different IP address for exiting to the Internet than for registering in the Tor network, and it stores whether a relay permitted transit of Tor traffic to the open Internet at that time. +footer.aboutexonerator.body=ExoneraTor-palvelu ylläpitää tietokantaa niistä IP-osoitteista, jotka ovat olleet osa Tor-verkkoa. Se vastaa, oliko tietyssä IP-osoitteessa Tor-välityspalvelin tiettynä päivänä. ExoneraTor voi tallentaa useamman kuin yhden IP-osoitteen per välityspalvelin, jos välityspalvelimet käyttävät Internetin lähtevään liikenteeseen eri osoitetta, kuin Tor-verkkorekisteröinnissä, ja se tallentaa tiedon siitä, salliko välityspalvelin Tor-liikenteen läpikulun avoimeen Internettiin sinä aikana. footer.language.name=Englanti footer.language.text=Tämä sivu on saatavilla myös seuraavilla kielillä:

1 0