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

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

10 Aug '20

commit b984d4e1d858ab38ab1003774e1be843e754dd36 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 16:18:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contents+ar.po b/contents+ar.po index 13e039f007..690349160f 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -7000,11 +7000,14 @@ msgid "" "[torrc](https://support.torproject.org/tbb/tbb-editing-torrc/) blank, and " "Tor will guess." msgstr "" +"فقط اترك سطر \"العنوان\" في [torrc] (https://support.torproject.org/tbb/tbb-" +"editing-torrc/) فارغًا ، وسيخمن Tor." #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.title) msgid "I'd run a relay, but I don't want to deal with abuse issues." msgstr "" +"كنت أقوم بتشغيل تتابع ، لكنني لا أريد التعامل مع قضايا إساءة الاستخدام." #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.description) @@ -7017,6 +7020,8 @@ msgid "" "Each Tor relay has an exit policy that specifies what sort of outbound " "connections are allowed or refused from that relay." msgstr "" +"يحتوي كل مرحل Tor على سياسة خروج تحدد نوع الاتصالات الصادرة المسموح بها أو " +"المرفوضة من هذا الترحيل." #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.description) @@ -7025,6 +7030,8 @@ msgid "" "clients will automatically avoid picking exit relays that would refuse to " "exit to their intended destination." msgstr "" +"يحتوي كل مرحل Tor على سياسة خروج تحدد نوع الاتصالات الصادرة المسموح بها أو " +"المرفوضة من هذا الترحيل." #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.description) @@ -7032,6 +7039,8 @@ msgid "" "This way each relay can decide the services, hosts, and networks it wants to" " allow connections to, based on abuse potential and its own situation." msgstr "" +"بهذه الطريقة ، يمكن لكل مرحل أن يقرر الخدمات والمضيفين والشبكات التي يريد " +"السماح بالاتصالات بها ، بناءً على احتمال إساءة الاستخدام والوضع الخاص به." #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.description) @@ -7042,6 +7051,11 @@ msgid "" "running an exit node with minimal " "harassment](https://blog.torproject.org/blog/tips-running-exit-node)." msgstr "" +"اقرأ [إدخال الدعم بشأن المشكلات التي قد تواجهها] " +"(https://support.torproject.org/abuse/exit-relay-expectations/) إذا كنت " +"تستخدم سياسة الخروج الافتراضية ، ثم اقرأ [نصائح مايك بيري حول تشغيل الخروج " +"عقدة بأقل قدر من المضايقات] (https://blog.torproject.org/blog/tips-running-" +"exit-node)." #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.description)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 10 Aug '20

10 Aug '20

commit 8132bb7a3730a398c1172d1333fbc89bc70cbb7c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 16:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index c3ba9ce89e..3fab3e9c69 100644 --- a/contents+es.po +++ b/contents+es.po @@ -7120,7 +7120,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) msgid "### How do I report a bad relay?" -msgstr "" +msgstr "### ¿Cómo reporto un repetidor malicioso?" #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -7128,6 +7128,8 @@ msgid "" "If you encounter a bad relay then please let us know and write to `bad-" "relays AT lists DOT torproject DOT org`." msgstr "" +"Si encuentras un repetidor malicioso, por favor háznoslo saber, y escribe a " +"`bad-relays AT lists DOT torproject DOT org`." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -7136,6 +7138,9 @@ msgid "" "check](https://check.torproject.org/). Please include the following in your " "report:" msgstr "" +"Puedes comprobar quésalida estás usando en cualquier momento visitando [tor " +"check](https://check.torproject.org/). Por favor incluye los siguiente en tu" +" reporte:" #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -7143,6 +7148,9 @@ msgid "" "1. The relay's IP address or fingerprint. The fingerprint is a forty-" "character hex string such as `203933ED4E55EF8A3C3518427D1A1ED6A4CC285E`." msgstr "" +"1. La dirección IP del repetidor o su huella dactilar. La huella dactilar es" +" una cadena de cuarenta caracteres hexadecimales tales como " +"`203933ED4E55EF8A3C3518427D1A1ED6A4CC285E`." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body)

1 0

[tor-browser-build/master] Bug 40011: Add SQLCipher for application-services
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 01cb89f0a1c6e46db7add953cfb63b1924ee8377 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 1 14:32:40 2020 +0000 Bug 40011: Add SQLCipher for application-services --- projects/sqlcipher/build | 131 ++++++++++++++++++++++++++++++++++++++++++++++ projects/sqlcipher/config | 21 ++++++++ 2 files changed, 152 insertions(+) diff --git a/projects/sqlcipher/build b/projects/sqlcipher/build new file mode 100644 index 0000000..d364000 --- /dev/null +++ b/projects/sqlcipher/build @@ -0,0 +1,131 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/sqlcipher +builddir=/var/tmp/build/[% project %] +mkdir /var/tmp/build +tar -C /var/tmp/dist -xf [% c('input_files_by_name/nss') %] + +# application-services uses a newer NDK, 21d, than all the other projects... +export ANDROID_NDK_API_VERSION=[% pc("fenix-android-toolchain", "var/android_ndk_version") %][% pc('fenix-android-toolchain', 'var/android_ndk_revision') %] +export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION +# We need to add the new path to our build tools to PATH +export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH +export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME +export NDK_HOST_TAG=linux-x86_64 + +export AR="[% c('var/cross_prefix') %]-ar" +# XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. +export CC="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang" +export CXX="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang++" +export LD="[% c('var/cross_prefix') %]-ld" +export RANLIB="[% c('var/cross_prefix') %]-ranlib" + +host="" +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + host="arm-linux" +[% ELSIF c("var/configure_host") == "i686-linux-android" -%] + host="i686-linux" +[% ELSIF c("var/configure_host") == "x86_64-linux-android" -%] + host="x86_64-linux" +[% ELSIF c("var/configure_host") == "aarch64-linux-android" -%] + host="arm-linux" +[% END -%] + +SQLCIPHER_CFLAGS=" \ + -DSQLITE_HAS_CODEC \ + -DSQLITE_SOUNDEX \ + -DHAVE_USLEEP=1 \ + -DSQLITE_MAX_VARIABLE_NUMBER=99999 \ + -DSQLITE_THREADSAFE=1 \ + -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 \ + -DNDEBUG=1 \ + -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 \ + -DSQLITE_ENABLE_LOAD_EXTENSION \ + -DSQLITE_ENABLE_COLUMN_METADATA \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_ENABLE_RTREE \ + -DSQLITE_ENABLE_STAT3 \ + -DSQLITE_ENABLE_STAT4 \ + -DSQLITE_ENABLE_JSON1 \ + -DSQLITE_ENABLE_FTS3_PARENTHESIS \ + -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS5 \ + -DSQLCIPHER_CRYPTO_NSS \ + -DSQLITE_ENABLE_DBSTAT_VTAB \ + -DSQLITE_SECURE_DELETE \ + -DSQLITE_DEFAULT_PAGE_SIZE=32768 \ + -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 \ + -I/var/tmp/dist/nss/include \ +" + +LIBS="\ + -lcertdb \ + -lcerthi \ + -lcryptohi \ + -lfreebl_static \ + -lnspr4 \ + -lnss_static \ + -lnssb \ + -lnssdev \ + -lnsspki \ + -lnssutil \ + -lpk11wrap_static \ + -lplc4 \ + -lplds4 \ + -lsoftokn_static \ +" + +[% IF c("var/configure_host") == "i686-linux-android" || c("var/configure_host") == "x86_64-linux-android"-%] + LIBS="${LIBS} -lgcm-aes-x86_c_lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-android" || c("var/configure_host") == "aarch64-linux-android"-%] + LIBS="${LIBS} -larmv8_c_lib" +[% END %] +[% IF c("var/configure_host") == "aarch64-linux-android" -%] + LIBS="${LIBS} -lgcm-aes-aarch64_c_lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + LIBS="${LIBS} -lgcm-aes-arm32-neon_c_lib" +[% END %] +[% IF c("var/configure_host") == "x86_64-linux-android"-%] + LIBS="${LIBS} -lintel-gcm-wrap_c_lib -lintel-gcm-s_lib -lhw-acc-crypto-avx -lhw-acc-crypto-avx2" +[% END %] + +tar -C /var/tmp/build -xf [% c('input_files_by_name/sqlcipher') %] +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir + +mkdir $builddir/build +cd build +../configure \ + --host="$host" \ + --with-pic \ + --verbose \ + --disable-shared \ + --with-crypto-lib=none \ + --disable-tcl \ + --enable-tempstore=yes \ + CFLAGS="${SQLCIPHER_CFLAGS}" \ + LDFLAGS="-L/var/tmp/dist/nss/lib" \ + LIBS="${LIBS} -llog -lm" + +make sqlite3.h +make sqlite3ext.h +make libsqlcipher.la + +mkdir -p $distdir/include/sqlcipher +mkdir -p $distdir/lib + +cp -p "$builddir/build/sqlite3.h" "$distdir/include/sqlcipher" +cp -p "$builddir/build/sqlite3ext.h" "$distdir/include/sqlcipher" +cp -p "$builddir/build/.libs/libsqlcipher.a" "$distdir/lib" + +# Just in case, ensure that the created binaries are not -w. +chmod +w "$distdir/lib/libsqlcipher.a" + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config new file mode 100644 index 0000000..fb4ae3a --- /dev/null +++ b/projects/sqlcipher/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +# The required versions for application-services can be found at the respective +# commit in libs/build-all.sh +version: 4.4.0 +var: + container: + use_container: 1 + deps: + - build-essential + - tcl + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: nss + project: nss + - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v[% c("version") %].tar.gz' + name: sqlcipher + sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148

1 0

[tor-browser-build/master] Bug 40010: Add NSS for application-services
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 53131fdc6d54bdd3bda261c64aa81fc3e8fbe228 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 30 10:12:32 2020 +0000 Bug 40010: Add NSS for application-services --- projects/nss/bug_13028.patch | 79 ++++++++++++++++++++++++ projects/nss/build | 139 +++++++++++++++++++++++++++++++++++++++++++ projects/nss/config | 27 +++++++++ projects/nss/config.patch | 37 ++++++++++++ projects/nss/configure.patch | 11 ++++ 5 files changed, 293 insertions(+) diff --git a/projects/nss/bug_13028.patch b/projects/nss/bug_13028.patch new file mode 100644 index 0000000..60bbd35 --- /dev/null +++ b/projects/nss/bug_13028.patch @@ -0,0 +1,79 @@ +From 2f0888c348561249d3083555db33c5619840dbfa Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Mon, 29 Sep 2014 14:30:19 -0700 +Subject: [PATCH] Bug 13028: Prevent potential proxy bypass cases. + +It looks like these cases should only be invoked in the NSS command line +tools, and not the browser, but I decided to patch them anyway because there +literally is a maze of network function pointers being passed around, and it's +very hard to tell if some random code might not pass in the proper proxied +versions of the networking code here by accident. + +diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c +index cea8456606bf..86fa971cfbef 100644 +--- a/security/nss/lib/certhigh/ocsp.c ++++ b/security/nss/lib/certhigh/ocsp.c +@@ -2932,6 +2932,14 @@ ocsp_ConnectToHost(const char *host, PRUint16 port) + PRNetAddr addr; + char *netdbbuf = NULL; + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted OSCP direct connect to %s, port %u\n", host, ++ port); ++ goto loser; ++#endif ++ + sock = PR_NewTCPSocket(); + if (sock == NULL) + goto loser; +diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +index e8698376b5be..85791d84a932 100644 +--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c ++++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +@@ -1334,6 +1334,13 @@ pkix_pl_Socket_Create( + plContext), + PKIX_COULDNOTCREATESOCKETOBJECT); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct socket connect\n"); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif ++ + socket->isServer = isServer; + socket->timeout = timeout; + socket->clientSock = NULL; +@@ -1433,6 +1440,13 @@ pkix_pl_Socket_CreateByName( + + localCopyName = PL_strdup(serverName); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct connect to %s\n", serverName); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif ++ + sepPtr = strchr(localCopyName, ':'); + /* First strip off the portnum, if present, from the end of the name */ + if (sepPtr) { +@@ -1582,6 +1596,13 @@ pkix_pl_Socket_CreateByHostAndPort( + PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByHostAndPort"); + PKIX_NULLCHECK_THREE(hostname, pStatus, pSocket); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct connect to %s, port %u\n", hostname, ++ portnum); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif + + prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), &hostent); + +-- +2.27.0 + diff --git a/projects/nss/build b/projects/nss/build new file mode 100644 index 0000000..791a680 --- /dev/null +++ b/projects/nss/build @@ -0,0 +1,139 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/nss +builddir=/var/tmp/build/[% project %] +mkdir /var/tmp/build +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/ninja:$PATH + +# application-services uses a newer NDK, 21d, than all the other projects... +export ANDROID_NDK_API_VERSION=[% pc("fenix-android-toolchain", "var/android_ndk_version") %][% pc('fenix-android-toolchain', 'var/android_ndk_revision') %] +export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION +# We need to add the new path to our build tools to PATH +export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH +export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME +export NDK_HOST_TAG=linux-x86_64 + +nspr_64="" +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + gyp_arch="arm" +[% ELSIF c("var/configure_host") == "i686-linux-android" -%] + gyp_arch="ia32" +[% ELSIF c("var/configure_host") == "x86_64-linux-android" -%] + gyp_arch="x64" + nspr_64="--enable-64bit" +[% ELSIF c("var/configure_host") == "aarch64-linux-android" -%] + gyp_arch="arm64" + nspr_64="--enable-64bit" +[% END -%] + +export AR="[% c('var/cross_prefix') %]-ar" +# XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. +export CC="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang" +export CXX="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang++" +export LD="[% c('var/cross_prefix') %]-ld" +export NM="[% c('var/cross_prefix') %]-nm" +export RANLIB="[% c('var/cross_prefix') %]-ranlib" +export READELF="[% c('var/cross_prefix') %]-readelf" + +tar -C /var/tmp/build -xf [% c('input_files_by_name/nss') %] +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir +# Early return hack to prevent NSPR Android setup +# which does not work with ndk unified headers and clang. See: +# application-services/libs/build-all.sh +cat $rootdir/configure.patch | patch nspr/configure +# Some NSS symbols clash with OpenSSL symbols, rename them using +# C preprocessor define macros. See: +# application-services/libs/build-all.sh +patch -p2 < $rootdir/config.patch +# Let's apply our proxy bypass defense-in-depth here as well to be on the safe +# side. +patch -p2 < $rootdir/bug_13028.patch + +# Building NSPR +mkdir $builddir/nspr_build +cd $builddir/nspr_build +../nspr/configure \ + $nspr_64 \ + --target=[% c("var/configure_host") %] \ + --disable-debug \ + --enable-optimize +make +cd .. + +# Building NSS +mkdir $builddir/nss_build +gyp -f ninja-android "$builddir/nss/nss.gyp" \ + --depth "$builddir/nss/" \ + --generator-output=. \ + -DOS=android \ + -Dnspr_lib_dir="$builddir/nspr_build/dist/lib" \ + -Dnspr_include_dir="$builddir/nspr_build/dist/include/nspr" \ + -Dnss_dist_dir="$builddir/nss_build" \ + -Dnss_dist_obj_dir="$builddir/nss_build" \ + -Dhost_arch="$gyp_arch" \ + -Dtarget_arch="$gyp_arch" \ + -Dstatic_libs=1 \ + -Ddisable_dbm=1 \ + -Dsign_libs=0 \ + -Denable_sslkeylogfile=0 \ + -Ddisable_tests=1 \ + -Ddisable_libpkix=1 + +gendir="$builddir/nss/out/Release" +ninja -C "$gendir" + +mkdir -p $distdir/include/nss +mkdir -p $distdir/lib +cp -p -L "$builddir/nss_build/lib/libcertdb.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libcerthi.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libcryptohi.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libfreebl_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnss_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssb.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssdev.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnsspki.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssutil.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpk11wrap_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpkcs12.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpkcs7.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libsmime.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libsoftokn_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libssl.a" "$distdir/lib" + +# HW specific. +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +[% IF c("var/configure_host") == "i686-linux-android" || c("var/configure_host") == "x86_64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-x86_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" || c("var/configure_host") == "aarch64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libarmv8_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "aarch64-linux-android" -%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-aarch64_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-arm32-neon_c_lib.a" "$distdir/lib" +[% END %] +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +[% IF c("var/configure_host") == "x86_64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libintel-gcm-wrap_c_lib.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libintel-gcm-s_lib.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libhw-acc-crypto-avx.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libhw-acc-crypto-avx2.a" "$distdir/lib" +[% END %] +cp -p -L "$builddir/nspr_build/dist/lib/libplc4.a" "$distdir/lib" +cp -p -L "$builddir/nspr_build/dist/lib/libplds4.a" "$distdir/lib" +cp -p -L "$builddir/nspr_build/dist/lib/libnspr4.a" "$distdir/lib" + +cp -p -L -R "$builddir/nss_build/public/nss/"* "$distdir/include/nss" +cp -p -L -R "$builddir/nspr_build/dist/include/nspr/"* "$distdir/include/nss" + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/nss/config b/projects/nss/config new file mode 100644 index 0000000..e2b875e --- /dev/null +++ b/projects/nss/config @@ -0,0 +1,27 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +# The required versions for application-services can be found at the respective +# commit in libs/build-all.sh +version: 3.54 +# XXX: maybe that's extractable automatically from `version` somehow? +version_path: 3_54 +nspr_version: 4.26 +var: + container: + use_container: 1 + deps: + - build-essential + - gyp + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: ninja + project: ninja + - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version_path") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' + name: nss + sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70 + - filename: configure.patch + - filename: config.patch + - filename: bug_13028.patch diff --git a/projects/nss/config.patch b/projects/nss/config.patch new file mode 100644 index 0000000..e7f5012 --- /dev/null +++ b/projects/nss/config.patch @@ -0,0 +1,37 @@ +From c11dc3a73349fc7d8fa451f9e3a4e3952aa54fd2 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 1 Jul 2020 09:57:01 +0000 +Subject: [PATCH] Patch for building NSS for application-services + +See: application-services/libs/build-all.sh + +diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi +index 62d3cc71ecaf..dd30de079081 100644 +--- a/security/nss/coreconf/config.gypi ++++ b/security/nss/coreconf/config.gypi +@@ -144,6 +144,23 @@ + '<(nspr_include_dir)', + '<(nss_dist_dir)/private/<(module)', + ], ++ 'defines': [ ++ 'HMAC_Update=NSS_HMAC_Update', ++ 'HMAC_Init=NSS_HMAC_Init', ++ 'CMAC_Update=NSS_CMAC_Update', ++ 'CMAC_Init=NSS_CMAC_Init', ++ 'MD5_Update=NSS_MD5_Update', ++ 'SHA1_Update=NSS_SHA1_Update', ++ 'SHA256_Update=NSS_SHA256_Update', ++ 'SHA224_Update=NSS_SHA224_Update', ++ 'SHA512_Update=NSS_SHA512_Update', ++ 'SHA384_Update=NSS_SHA384_Update', ++ 'SEED_set_key=NSS_SEED_set_key', ++ 'SEED_encrypt=NSS_SEED_encrypt', ++ 'SEED_decrypt=NSS_SEED_decrypt', ++ 'SEED_ecb_encrypt=NSS_SEED_ecb_encrypt', ++ 'SEED_cbc_encrypt=NSS_SEED_cbc_encrypt', ++ ], + 'conditions': [ + [ 'mozpkix_only==1 and OS=="linux"', { + 'include_dirs': [ +-- +2.27.0 diff --git a/projects/nss/configure.patch b/projects/nss/configure.patch new file mode 100644 index 0000000..4ce8465 --- /dev/null +++ b/projects/nss/configure.patch @@ -0,0 +1,11 @@ +@@ -2662,6 +2662,9 @@ + + case "$target" in + *-android*|*-linuxandroid*) ++ $as_echo "#define ANDROID 1" >>confdefs.h ++ ;; ++ unreachable) + if test -z "$android_ndk" ; then + as_fn_error $? "You must specify --with-android-ndk=/path/to/ndk when targeting Android." "$LINENO" 5 + fi +

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 10 Aug '20

10 Aug '20

commit 5572efdf41ef5c780878f7b8228f065d7e00939b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 15:45:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/contents+es.po b/contents+es.po index ea691c9fd9..c3ba9ce89e 100644 --- a/contents+es.po +++ b/contents+es.po @@ -7064,6 +7064,12 @@ msgid "" "sure to set the [MyFamily parameter](https://www.torproject.org/docs/tor-" "manual.html.en#MyFamily)." msgstr "" +"* Efectuar un [ataque Sybil](https://en.wikipedia.org/wiki/Sybil_attack), lo" +" cual significa inundar la red con nuevos repetidores en un esfuerzo para " +"eiminar el anonimato de los usuarios. Si quieres correr múltiples " +"repetidores, ¡eso es fantástico! Pero por favor asegúrate de establecer el " +"[parámetro MyFamily](https://www.torproject.org/docs/tor-" +"manual.html.en#MyFamily)." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -7071,6 +7077,8 @@ msgid "" "* Exit relays routing their exit traffic back into the tor network (not " "actually exiting any traffic)" msgstr "" +"* Repetidores de salida enrutando su tráfico de nuevo dentro de la red tor " +"(en realidad, sin hacer salir tráfico alguno)" #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -7078,6 +7086,9 @@ msgid "" "Also, if your relay is stolen or goes missing, please report it as well, so " "we can blacklist it in case whoever took it puts it back online." msgstr "" +"También, si tu repetidor es robado o desaparece, por favor repórtalo, de " +"forma que podamos ponerlo en la lista negra en caso que quienquiera que lo " +"tenga, lo ponga de nuevo en línea." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -7085,6 +7096,9 @@ msgid "" "The following are currently permitted yet do have some discussion for " "prohibition (as such, they should not be reported at this time)..." msgstr "" +"Los siguientes están permitidos actualmente, aunque hay algunas discusiones " +"para su prohibición (como tales, no debieran ser reportados en este " +"momento)..." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -7095,6 +7109,13 @@ msgid "" "[context](https://www.google.com/search?site:torproject.org+80+443+6667) and" " [spec](https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1969)." msgstr "" +"* Permitiendo solamente tráfico de texto legible (por ejemplo, solo el " +"puerto 80). No hay una buena razón para deshabilitar su contraparte cifrada " +"(como el puerto 443), haciendo a estos repetidores altamente sospechosos de " +"espiar en el tráfico. Mira el " +"[contexto](https://www.google.com/search?site:torproject.org+80+443+6667) y " +"la [especificación](https://gitweb.torproject.org/torspec.git/tree/dir-" +"spec.txt#n1969)." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body)

1 0

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

10 Aug '20

commit d4c0863a84610f1df6a2bb3629c66814b9bee2dd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 15:18:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 1acbf77915..13908ffa4a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -8362,7 +8362,7 @@ msgid "" "later." msgstr "" "Si vous ne parvenez toujours pas à vous connecter au service onion, veuillez" -" ressayer ultérieurement." +" réessayer ultérieurement." #: https//support.torproject.org/onionservices/onionservices-3/ #: (content/onionservices/onionservices-3/contents+en.lrquestion.description)

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 10 Aug '20

10 Aug '20

commit 2bdac81a7fdc18a4db50ddddd4d3beedd6249dd1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 15:18:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- fr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index 1b26ec5ab1..8e2c4aa67c 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -79,7 +79,7 @@ Selon votre position géographique, un pont pourrait fonctionner mieux qu’un a <!ENTITY torPreferences.requestBridgeDialogTitle "Demander un pont"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Connexion à BridgeDB. Veuillez patienter."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résolvez le captcha pour demander un pont."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez ressayer."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez réessayer."> <!ENTITY torPreferences.viewTorLogs "Visualiser les journaux Tor."> <!ENTITY torPreferences.viewLogs "Visualiser les journaux…"> <!ENTITY torPreferences.torLogsDialogTitle "Journaux Tor">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 10 Aug '20

10 Aug '20

commit f391648b4ec884735b58105cfef9dca38cb7686e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 15:18:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- fr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index 1b26ec5ab1..8e2c4aa67c 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -79,7 +79,7 @@ Selon votre position géographique, un pont pourrait fonctionner mieux qu’un a <!ENTITY torPreferences.requestBridgeDialogTitle "Demander un pont"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Connexion à BridgeDB. Veuillez patienter."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résolvez le captcha pour demander un pont."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez ressayer."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez réessayer."> <!ENTITY torPreferences.viewTorLogs "Visualiser les journaux Tor."> <!ENTITY torPreferences.viewLogs "Visualiser les journaux…"> <!ENTITY torPreferences.torLogsDialogTitle "Journaux Tor">

1 0

[translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
by translation＠torproject.org 10 Aug '20

10 Aug '20

commit 53be96ac29b2a1f027976385726db9e072daeb7a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 15:18:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- fr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index b1381ca803..bcf84c710a 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.request_a_bridge=Demander un pont… torlauncher.request_a_new_bridge=Demander un nouveau pont… torlauncher.contacting_bridgedb=Connexion à BridgeDB. Veuillez patienter. torlauncher.captcha_prompt=Résolvez le captcha pour demander un pont. -torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer. +torlauncher.bad_captcha_solution=La solution est erronée. Veuillez réessayer. torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts. torlauncher.no_bridges_available=Aucun pont n’est proposé pour l’instant. Désolé.

1 0

[translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
by translation＠torproject.org 10 Aug '20

10 Aug '20

commit d9183e3747ca1313c4e6baff0b9b2ff1ecf96105 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 15:18:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- fr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index b1381ca803..bcf84c710a 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.request_a_bridge=Demander un pont… torlauncher.request_a_new_bridge=Demander un nouveau pont… torlauncher.contacting_bridgedb=Connexion à BridgeDB. Veuillez patienter. torlauncher.captcha_prompt=Résolvez le captcha pour demander un pont. -torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer. +torlauncher.bad_captcha_solution=La solution est erronée. Veuillez réessayer. torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts. torlauncher.no_bridges_available=Aucun pont n’est proposé pour l’instant. Désolé.

1 0