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

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 17 Aug '21

17 Aug '21

commit 0bde16847f4d0007d5652c1b9a4dc8d9b208fa66 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 17 18:48:02 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ar.po | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index e3c9938516..38eaded4c9 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -776,6 +776,8 @@ msgid "" "With [Snowflake](https://snowflake.torproject.org), censored users can rely " "on proxies run by volunteers to connect to the internet." msgstr "" +"باستخدام [Snowflake] (https://snowflake.torproject.org)، يمكن للمستخدمين " +"الخاضعين للرقابة الاعتماد على وكلاء يديرها متطوعون للاتصال بالإنترنت." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -784,6 +786,9 @@ msgid "" "better understand Snowflake’s user experience](https://blog.torproject.org" "/snowflake-in-tor-browser-stable)." msgstr "" +"خلال الربع الأول من هذا العام، [أجرى فريق تجربة المستخدم استطلاعًا على متصفح" +" Tor Alpha لفهم تجربة مستخدم Snowflake بشكل أفضل] " +"(https://blog.torproject.org/snowflake-in-tor-browser-stable)" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -791,6 +796,8 @@ msgid "" "The survey received 1,795 complete responses, of which 726 participants " "confirmed they use Snowflake as a pluggable transport." msgstr "" +"تلقى الاستطلاع 1795 إجابة كاملة، منها 726 مشاركًا أكدوا أنهم يستخدمون ندفة " +"الثلج كوسيلة نقل قابلة للتوصيل." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -914,6 +921,8 @@ msgid "" "* " "[tpo/applications/fenix#40174](https://gitlab.torproject.org/tpo/application…" msgstr "" +"* " +"[tpo/applications/fenix#40174](https://gitlab.torproject.org/tpo/application…" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -922,6 +931,9 @@ msgid "" "browser#40242](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/40242)" msgstr "" +"* [tpo/applications/tor-" +"browser#40242](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/40242)" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -929,6 +941,8 @@ msgid "" "* " "[tpo/applications/fenix#40103](https://gitlab.torproject.org/tpo/application…" msgstr "" +"* " +"[tpo/applications/fenix#40103](https://gitlab.torproject.org/tpo/application…" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -936,11 +950,13 @@ msgid "" "* " "[tpo/applications/fenix#40115](https://gitlab.torproject.org/tpo/application…" msgstr "" +"* " +"[tpo/applications/fenix#40115](https://gitlab.torproject.org/tpo/application…" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Give Feedback" -msgstr "" +msgstr "#### إبداء الرأي " #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.title) @@ -1493,7 +1509,7 @@ msgstr "" #: https//www.torproject.org/privchat/chapter-4/ #: (content/privchat/chapter-4/contents+en.lrpage.title) msgid "Privchat chapter 4" -msgstr "" +msgstr "الدردشة الخاصة الفصل 4" #: https//www.torproject.org/press/-new-release-tails/ #: (content/press/new-release-tails/contents+en.lrpost.title) @@ -1974,7 +1990,7 @@ msgstr "" #: templates/download.html:10 msgid "Select \"Tor Network Settings\" and \"Use a bridge\"." -msgstr "" +msgstr "حدد \"إعدادات شبكة Tor\" و \"استخدام جسر\"." #: templates/download.html:13 msgid ""

1 0

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

17 Aug '21

commit c63885b4e47392b11d850e34a03e969f2264df62 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 17 18:45:16 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+ar.po b/contents+ar.po index 8c17b51972..bca8df7568 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -928,6 +928,8 @@ msgid "" "4. Allow the UX team time to discuss each issue and forward it to developers" " when necessary." msgstr "" +"4. امنح فريق تجربة المستخدم وقتًا لمناقشة كل مشكلة وإعادة توجيهها إلى " +"المطورين عند الضرورة." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -1187,6 +1189,8 @@ msgid "" "We use free and open source software to analyze our data, and we recommend " "our volunteers do the same." msgstr "" +"نحن نستخدم برامج مجانية ومفتوحة المصدر لتحليل بياناتنا، ونوصي متطوعينا بفعل " +"الشيء نفسه." #: https//community.torproject.org/user-research/how-to-volunteer/ #: (content/user-research/how-to-volunteer/contents+en.lrpage.body) @@ -1194,6 +1198,8 @@ msgid "" "We also ask anyone running research not use software hosted by third parties" " like cloud providers." msgstr "" +"كما نطلب من أي شخص يجري بحثًا ألا يستخدم البرامج التي تستضيفها جهات خارجية " +"مثل موفري الخدمات السحابية." #: https//community.torproject.org/user-research/how-to-volunteer/ #: (content/user-research/how-to-volunteer/contents+en.lrpage.body)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 17 Aug '21

17 Aug '21

commit f8783ab225231dd6c4f078f468d47c12c74fd7a2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 17 18:17:34 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ar.po | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 0de157b9b2..e3c9938516 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -752,6 +752,9 @@ msgid "" "timeline), v2 onion services will be completely unreachable once Tor Browser" " moves to Tor 0.4.6.x in October 2021." msgstr "" +"كما [أعلنا العام الماضي](https://blog.torproject.org/v2-deprecation-" +"timeline) ، لن تكون خدمات Onion v2 قابلة للوصول تمامًا بمجرد انتقال متصفح " +"Tor إلى Tor 0.4.6.x في أكتوبر 2021." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -759,11 +762,13 @@ msgid "" "From now until then, Tor Browser will warn you when visiting a v2 onion site" " of its upcoming deprecation." msgstr "" +"من الآن وحتى ذلك الحين، سوف يحذرك متصفح Tor عند زيارة موقع v2 onion من " +"الإيقاف القادم." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Snowflake is now available as a bridge" -msgstr "" +msgstr "####Snowflake متاحة الآن كجسر" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -793,6 +798,8 @@ msgid "" "The majority of Snowflake users who completed the survey began using Tor " "Browser several times a week within the past year." msgstr "" +"بدأ غالبية مستخدمي Snowflake الذين أكملوا الاستبيان باستخدام متصفح Tor عدة " +"مرات في الأسبوع خلال العام الماضي." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -800,6 +807,8 @@ msgid "" "75% of users had a positive view of Snowflake, although many experienced " "connection troubles and slow speeds while browsing." msgstr "" +"كان لدى 75٪ من المستخدمين نظرة إيجابية لـ Snowflake، على الرغم من أن العديد " +"من المستخدمين واجهوا مشاكل في الاتصال وسرعات بطيئة أثناء التصفح." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -807,11 +816,12 @@ msgid "" "These facts and the stable network of volunteers allow us to make it " "available on this release." msgstr "" +"هذه الحقائق والشبكة المستقرة من المتطوعين تسمح لنا بإتاحتها في هذا الإصدار." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Improving the user experience of connecting to Tor" -msgstr "" +msgstr "#### تحسين تجربة المستخدم للاتصال بـ Tor" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -820,12 +830,15 @@ msgid "" "acted as the options panel for advanced Tor network configurations over the " "years." msgstr "" +"[ منصة إطلاقTor ](https://support.torproject.org/glossary/tor-launcher/) " +"عملت كلوحة خيارات لتكوينات شبكة Tor المتقدمة على مر السنين." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "" "It also serves as a control point for users who are in censored networks." msgstr "" +"كما أنها بمثابة نقطة تحكم للمستخدمين الموجودين في الشبكات الخاضعة للرقابة." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -833,6 +846,8 @@ msgid "" "The UX and the Anti-Censorship teams joined efforts to improve the " "connecting flow for Tor Browser users." msgstr "" +"انضم فريق تجربة المستخدم وفريق مكافحة الرقابة إلى الجهود المبذولة لتحسين " +"تدفق الاتصال لمستخدمي متصفح Tor." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -841,16 +856,19 @@ msgid "" "seamlessly access the open internet by simplifying the connection flow, " "detecting censorship and providing bridges." msgstr "" +"هذا الإصدار هو الأول في السلسلة القادمة لمساعدة المستخدمين الخاضعين للرقابة " +"على الوصول بسلاسة إلى الإنترنت المفتوح من خلال تبسيط تدفق الاتصال واكتشاف " +"الرقابة وتوفير الجسور." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Known Issues" -msgstr "" +msgstr "#### مشاكل معروفة" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "Tor Browser 10.5 comes with a number of known issues:" -msgstr "" +msgstr "يأتي متصفح Tor متصفح 10.5 بعدد من المشكلات المعروفة:" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -859,6 +877,9 @@ msgid "" "browser#40497](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/40497)" msgstr "" +"* [tpo/applications/tor-" +"browser#40497](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/40497)" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -866,6 +887,8 @@ msgid "" "* " "[tpo/applications/fenix#40176](https://gitlab.torproject.org/tpo/application…" msgstr "" +"* " +"[tpo/applications/fenix#40176](https://gitlab.torproject.org/tpo/application…" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -873,6 +896,8 @@ msgid "" "* " "[tpo/applications/fenix#40110](https://gitlab.torproject.org/tpo/application…" msgstr "" +"* " +"[tpo/applications/fenix#40110](https://gitlab.torproject.org/tpo/application…" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -880,6 +905,8 @@ msgid "" "* " "[tpo/applications/fenix#40172](https://gitlab.torproject.org/tpo/application…" msgstr "" +"* " +"[tpo/applications/fenix#40172](https://gitlab.torproject.org/tpo/application…" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 17 Aug '21

17 Aug '21

commit 449f33522152bf690129434b1822932dd265b006 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 17 17:47:47 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ar.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 5f81e02b8b..0de157b9b2 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -213,7 +213,7 @@ msgstr "التأريخ" #: https//www.torproject.org/privchat/ #: (content/privchat/contents+en.lrpage.title) msgid "PrivChat" -msgstr "" +msgstr "الدردشة الخاصة" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.title) @@ -696,12 +696,12 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.title) msgid "Tor Browser 10.5" -msgstr "" +msgstr "Tor متصفح 10.5" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "## New Release: Tor Browser 10.5" -msgstr "" +msgstr "## الإصدار الجديد: متصفح Tor 10.5" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -709,6 +709,8 @@ msgid "" "Tor Browser 10.5 is now available from the Tor Browser download page and our" " distribution directory." msgstr "" +"متصفح Tor متصفح 10.5 متاح الآن من صفحة تنزيل متصفح Tor ودليل التوزيع الخاص " +"بنا." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -716,11 +718,13 @@ msgid "" "The Android version is also available from Google Play and should be " "available from F-Droid within the next day." msgstr "" +"إصدار أندرويد متاح أيضًا من متجر جوجل يجب أن يكون متاحًا من اف درويد في " +"اليوم التالي." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "This release includes important security updates to Firefox." -msgstr "" +msgstr "يتضمن هذا الإصدار تحديثات أمان مهمة لمتصفح فايرفوكس." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -728,6 +732,8 @@ msgid "" "This new Tor Browser release is focussed on improving the internet access of" " users connecting through Tor in censored contexts." msgstr "" +"يركز إصدار متصفح Tor الجديد هذا على تحسين الوصول إلى الإنترنت للمستخدمين " +"المتصلين عبر Tor في السياقات الخاضعة للرقابة." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -737,7 +743,7 @@ msgstr "### ما هو الجديد؟" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### V2 Onion Services Deprecation" -msgstr "" +msgstr "#### V2 إيقاف خدمات Onion" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)

1 0

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

17 Aug '21

commit bd03f5b3c3a827bad5cbce7b1c0ed1d9bc32b65e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 17 17:15:10 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contents+ar.po b/contents+ar.po index 4cfa52ab95..8c17b51972 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -658,6 +658,12 @@ msgid "" "form](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%2…" " beforehand." msgstr "" +"لا نحتفظ أو ننشر الأسماء أو تفاصيل الاتصال الخاصة بالمشاركين في البحث، وفي " +"أي وقت ستتعامل فيه مع بيانات المشاركين (سواء كان ذلك عن طريق مرات الظهور أو " +"عمليات إرسال الاستبيان أو السجلات الأخرى)، يجب أن تطلب موافقتهم كتابيًا " +"باستخدام [نموذج " +"الموافقة](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scrip…" +" مسبقا." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -679,6 +685,8 @@ msgid "" "Join us at any time on our IRC channel #tor-ux or our [mailing " "list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)." msgstr "" +"انضم إلينا في أي وقت على قناة IRC الخاصة بنا # tor-ux أو [القائمة البريدية] " +"الخاصة بنا (https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body)

1 0

[tor-browser-build/maint-10.5] Remove uniuri project.
by sysrqb＠torproject.org 17 Aug '21

17 Aug '21

commit edeef6515aadcae310b61c218ea2c9851cbaef67 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 27 20:06:46 2021 +0000 Remove uniuri project. This is not used by snowflake since https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… It was also a dependency in the obfs4 project, but obfs4 doesn't use it. --- projects/obfs4/build | 1 - projects/obfs4/config | 2 -- projects/snowflake/build | 1 - projects/snowflake/config | 2 -- projects/uniuri/config | 17 ----------------- 5 files changed, 23 deletions(-) diff --git a/projects/obfs4/build b/projects/obfs4/build index 47c7228..b57b0c5 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -15,7 +15,6 @@ mkdir -p $PTDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] diff --git a/projects/obfs4/config b/projects/obfs4/config index 8273bd5..eec61bb 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -26,8 +26,6 @@ input_files: project: ed25519 - name: siphash project: siphash - - name: uniuri - project: uniuri - name: goxcrypto project: goxcrypto - name: goxnet diff --git a/projects/snowflake/build b/projects/snowflake/build index a72caba..4c99675 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -12,7 +12,6 @@ mkdir -p $PTDIR $DOCSDIR export CGO_ENABLED=1 [% END -%] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %] diff --git a/projects/snowflake/config b/projects/snowflake/config index 6022b2c..27c43d9 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -12,8 +12,6 @@ input_files: - project: container-image - name: go project: go - - name: uniuri - project: uniuri - name: goptlib project: goptlib - name: pion-webrtc diff --git a/projects/uniuri/config b/projects/uniuri/config deleted file mode 100644 index 5eea6e2..0000000 --- a/projects/uniuri/config +++ /dev/null @@ -1,17 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dchest/uniuri -git_hash: 8902c56451e9b58ff940bbe5fec35d5f9c04584a -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/dchest/uniuri - -input_files: - - project: container-image - - name: go - project: go

1 0

[tor-browser-build/maint-10.5] Bug 40333: Add a temporary ff91esr target in rbm.conf
by sysrqb＠torproject.org 17 Aug '21

17 Aug '21

commit 2df9fec5496899de07c6820f0e13c16e3cdb6d85 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 8 16:47:24 2021 +0200 Bug 40333: Add a temporary ff91esr target in rbm.conf --- projects/cbindgen/config | 2 +- projects/clang/build | 2 +- projects/clang/config | 6 +++--- projects/node/config | 2 +- projects/rust/build | 4 ++-- projects/rust/config | 8 +++++--- rbm.conf | 11 +++++++++++ 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 125d0e4..6b7695e 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -13,7 +13,7 @@ var: use_container: 1 targets: - android: + ff91esr: var: cbindgen_version: 0.19.0 cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2 diff --git a/projects/clang/build b/projects/clang/build index 05a93dc..608d80c 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -25,7 +25,7 @@ export LLVM_HOME=$(pwd) mkdir build cd build # XXX: remove duplicated parts while fixing tor-browser-build#40048 -[% IF ! c("var/android") %] +[% IF ! c("var/ff91esr") %] cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE:STRING=Release \ [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] diff --git a/projects/clang/config b/projects/clang/config index 2d12335..3ce6d97 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -8,7 +8,7 @@ var: use_container: 1 targets: - android: + ff91esr: var: llvm_version: '[% pc("llvm-project", "version") %]' @@ -32,7 +32,7 @@ input_files: name: cmake - project: clang-source name: clang-source - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/ff91esr") %]' - project: llvm-project name: clang-source - enable: '[% c("var/android") %]' + enable: '[% c("var/ff91esr") %]' diff --git a/projects/node/config b/projects/node/config index 87de822..30fce8d 100644 --- a/projects/node/config +++ b/projects/node/config @@ -8,7 +8,7 @@ var: use_container: 1 targets: - android: + ff91esr: var: node_version: 10.23.1 node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa diff --git a/projects/rust/build b/projects/rust/build index 9609758..d4061eb 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -4,7 +4,7 @@ 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" -[% IF c("var/android") %] +[% IF c("var/ff91esr") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] export PATH=/var/tmp/dist/ninja:$PATH [% END %] @@ -40,7 +40,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] cd /var/tmp/build/rustc-[% c('version') %]-src -[% IF ! c("var/android") %] +[% IF ! c("var/ff91esr") %] # LLVM has reproducibility issues when optimizing bitcode, which we need to # patch. See: #32053 for more details. cd src/llvm-project diff --git a/projects/rust/config b/projects/rust/config index b6e22d7..05d33b2 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -9,10 +9,12 @@ var: use_container: 1 targets: - android: + ff91esr: var: current_version: 1.52.0 previous_version: 1.51.0 + android: + var: arch_deps: - libssl-dev - pkg-config @@ -81,7 +83,7 @@ input_files: name: cmake - project: ninja name: ninja - enable: '[% c("var/android") %]' + enable: '[% c("var/ff91esr") %]' - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' - URL: 'https://static.rust-lang.org/dist/rustc-[% c("var/current_version") %]-src.tar.gz' @@ -98,4 +100,4 @@ input_files: enable: '[% c("var/windows-i686") %]' - filename: 43909.patch name: 43909 - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/ff91esr") %]' diff --git a/rbm.conf b/rbm.conf index 95ec20a..7eb2e00 100644 --- a/rbm.conf +++ b/rbm.conf @@ -265,9 +265,17 @@ targets: - zip - unzip + # Temporary target for the switch to firefox91. We use it to switch each + # platform separately to firefox91, and we should remove it once all + # platforms have been moved to it. + ff91esr: + var: + ff91esr: 1 + torbrowser-android-armv7: - android-armv7 - android + - ff91esr android-armv7: arch: armv7 var: @@ -279,6 +287,7 @@ targets: torbrowser-android-x86: - android-x86 - android + - ff91esr android-x86: arch: x86 var: @@ -290,6 +299,7 @@ targets: torbrowser-android-x86_64: - android-x86_64 - android + - ff91esr android-x86_64: arch: x86_64 var: @@ -301,6 +311,7 @@ targets: torbrowser-android-aarch64: - android-aarch64 - android + - ff91esr android-aarch64: arch: aarch64 var:

1 0

[tor-browser-build/maint-10.5] Bug 40330: Make the list of android components updates for switch to mozilla91-based Fenix
by sysrqb＠torproject.org 17 Aug '21

17 Aug '21

commit 73a31196642ea30aa99af82429aaa697afab72ed Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jul 13 12:45:30 2021 +0200 Bug 40330: Make the list of android components updates for switch to mozilla91-based Fenix --- projects/android-components/config | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index dab6800..af7b242 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,8 +58,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/android-components.git - #git_hash: v90.0.11 + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: releases/91.0 #tag_gpg_id: 0 var: container: diff --git a/projects/fenix/config b/projects/fenix/config index 146290c..d683293 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -56,8 +56,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/fenix.git - #git_hash: v90.0.0-beta.6 + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: releases_v91.0.0 #tag_gpg_id: 0 input_files: [] var: diff --git a/projects/geckoview/config b/projects/geckoview/config index 6ed2e1a..ce453e2 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - #git_url: https://github.com/mozilla/gecko-dev.git - # 90.0b12 - #git_hash: 5e8ffbe1bf6d448cb235cb0a64a56646a6537b22 + git_url: https://github.com/mozilla/gecko-dev.git + # beta + git_hash: beta tag_gpg_id: 0 input_files: [] var:

1 0

[tor-browser-build/maint-10.5] Bug 40332: Update rust to 1.53.0
by sysrqb＠torproject.org 17 Aug '21

17 Aug '21

commit 1c8682e16daa07f51f271f3e42f3af9bbb672500 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 8 16:49:11 2021 +0200 Bug 40332: Update rust to 1.53.0 --- projects/rust/build | 7 +++ projects/rust/config | 9 +++- projects/rust/fix-build-1.53.0.patch | 88 ++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index d4061eb..3d68e61 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -46,6 +46,13 @@ cd /var/tmp/build/rustc-[% c('version') %]-src cd src/llvm-project patch -p1 < $rootdir/[% c('input_files_by_name/43909') %] cd ../../ +[% ELSE -%] + # Patches for fixing: + # https://github.com/rust-lang/rust/issues/86436 + # https://github.com/rust-lang/rust/pull/86568 + # https://github.com/rust-lang/rust/issues/86999 + # This can be removed when updating to >= 1.54.0. + patch -p1 < $rootdir/fix-build-1.53.0.patch [% END %] [% IF c("var/windows-i686") %] diff --git a/projects/rust/config b/projects/rust/config index 05d33b2..55bf544 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: ff91esr: var: - current_version: 1.52.0 - previous_version: 1.51.0 + current_version: 1.53.0 + previous_version: 1.52.0 android: var: arch_deps: @@ -101,3 +101,8 @@ input_files: - filename: 43909.patch name: 43909 enable: '[% ! c("var/ff91esr") %]' + + # Fix for https://github.com/rust-lang/rust/issues/86436 + # Taken from https://github.com/rust-lang/rust/pull/86568 (merged it 1.54.0) + - filename: fix-build-1.53.0.patch + enable: '[% c("var/ff91esr") %]' diff --git a/projects/rust/fix-build-1.53.0.patch b/projects/rust/fix-build-1.53.0.patch new file mode 100644 index 0000000..4b4f092 --- /dev/null +++ b/projects/rust/fix-build-1.53.0.patch @@ -0,0 +1,88 @@ +commit 601d24810e89efd42f7cd69d4a7ccecd4e35364d +Author: Eric Huss <eric(a)huss.org> +Date: Tue Jun 22 22:10:25 2021 -0700 + + Don't dist miri on stable or beta. + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index 71ed0af4a7c..e0c33f73577 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -1171,6 +1171,9 @@ impl Step for Miri { + } + + fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { ++ if !builder.build.unstable_features() { ++ return None; ++ } + let compiler = self.compiler; + let target = self.target; + assert!(builder.config.extended); + + +commit 6aa79a34d87252deaae11e75663e5740a22f14ea +Author: Eric Huss <eric(a)huss.org> +Date: Wed Jun 23 07:03:42 2021 -0700 + + Comment and include rust-analyzer. + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index e0c33f73577..19895baf08f 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -1072,6 +1072,12 @@ impl Step for RustAnalyzer { + } + + fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { ++ // This prevents rust-analyzer from being built for "dist" or "install" ++ // on the stable/beta channels. It is a nightly-only tool and should ++ // not be included. ++ if !builder.build.unstable_features() { ++ return None; ++ } + let compiler = self.compiler; + let target = self.target; + assert!(builder.config.extended); +@@ -1171,6 +1177,9 @@ impl Step for Miri { + } + + fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { ++ // This prevents miri from being built for "dist" or "install" ++ // on the stable/beta channels. It is a nightly-only tool and should ++ // not be included. + if !builder.build.unstable_features() { + return None; + } + + + Disable rust-analyzer + +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index cff1ec843ff..3767b0387a0 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -482,7 +482,6 @@ impl<'a> Builder<'a> { + install::Std, + install::Cargo, + install::Rls, +- install::RustAnalyzer, + install::Rustfmt, + install::RustDemangler, + install::Clippy, +diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs +index 13ee909afd5..a38fc9e95eb 100644 +--- a/src/bootstrap/install.rs ++++ b/src/bootstrap/install.rs +@@ -164,12 +164,6 @@ install!((self, builder, _config), + ); + } + }; +- RustAnalyzer, "rust-analyzer", Self::should_build(_config), only_hosts: true, { +- let tarball = builder +- .ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target }) +- .expect("missing rust-analyzer"); +- install_sh(builder, "rust-analyzer", self.compiler.stage, Some(self.target), &tarball); +- }; + Clippy, "clippy", Self::should_build(_config), only_hosts: true, { + let tarball = builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target }); + install_sh(builder, "clippy", self.compiler.stage, Some(self.target), &tarball);

1 0

[tor-browser-build/maint-10.5] Bug 40331: Update components for mozilla91: application-services part
by sysrqb＠torproject.org 17 Aug '21

17 Aug '21

commit e8411c88401b49dd322c41af77f55a581d81685d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 12 18:31:14 2021 +0200 Bug 40331: Update components for mozilla91: application-services part --- ...niverse-of-known-types-in-an-ordered-BTre.patch | 51 ---------------------- projects/application-services/build | 9 ---- projects/application-services/config | 9 ++-- projects/nss/config | 8 ++-- 4 files changed, 8 insertions(+), 69 deletions(-) diff --git a/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch b/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch deleted file mode 100644 index 947b2f6..0000000 --- a/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4b9826025ac3242580efd7549d9b55d4466112e3 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <sysrqb(a)torproject.org> -Date: Wed, 28 Apr 2021 18:38:47 +0000 -Subject: [PATCH] Store the universe of known types in an ordered BTreeSet - (#374) - -The set of types is used in multiple places during FFI creation. When -the data structure does not guarantee the order of elements, such as -HashSet, the resulting generated source code is not deterministic. Using -a BTreeSet resolves this issue by providing a well-defined element order -over which the the set may be iterated. ---- - uniffi_bindgen/src/interface/types/mod.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/uniffi_bindgen/src/interface/types/mod.rs b/uniffi_bindgen/src/interface/types/mod.rs -index c4b0094..670b4bb 100644 ---- a/uniffi_bindgen/src/interface/types/mod.rs -+++ b/uniffi_bindgen/src/interface/types/mod.rs -@@ -21,7 +21,7 @@ - //! about how these API-level types map into the lower-level types of the FFI layer as represented - //! by the [`ffi::FFIType`] enum, but that's a detail that is invisible to end users. - --use std::{collections::hash_map::Entry, collections::HashMap, collections::HashSet}; -+use std::{collections::hash_map::Entry, collections::BTreeSet, collections::HashMap}; - - use anyhow::{bail, Result}; - -@@ -35,7 +35,7 @@ pub(super) use resolver::{resolve_builtin_type, TypeResolver}; - /// Represents all the different high-level types that can be used in a component interface. - /// At this level we identify user-defined types by name, without knowing any details - /// of their internal structure apart from what type of thing they are (record, enum, etc). --#[derive(Debug, Clone, Eq, PartialEq, Hash)] -+#[derive(Debug, Clone, Eq, PartialEq, Hash, Ord, PartialOrd)] - pub enum Type { - // Primitive types. - UInt8, -@@ -159,8 +159,8 @@ impl Into<FFIType> for &Type { - pub(crate) struct TypeUniverse { - // Named type definitions (including aliases). - type_definitions: HashMap<String, Type>, -- // All the types in the universe, by canonical type name. -- all_known_types: HashSet<Type>, -+ // All the types in the universe, by canonical type name, in a well-defined order. -+ all_known_types: BTreeSet<Type>, - } - - impl TypeUniverse { --- -2.25.1 - diff --git a/projects/application-services/build b/projects/application-services/build index ec0aea3..c6e52ad 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -49,15 +49,6 @@ directory = "/var/tmp/build/application-services/vendor" offline=true EOF -# Bug 40293: Patch vendored uniffi_bindgen. -pushd /var/tmp/build/application-services/vendor/ -patch -p1 < $rootdir/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch -# Update the expected checksum in the vendored source. -sed -i \ - 's/e39e61458d0d28c2b3425852c8a55625cc185ce806fbc7c0c6682f8cc93dec8d/0909e5214eedf1f2e709909176b1cbda39887002b26388535c3bc551fb04da1b/' \ - uniffi_bindgen/.cargo-checksum.json -popd - # Move NSS and SQLCipher to the right place # XXX: Maybe merge with the loop above. archs="armv7 aarch64 x86 x86_64" diff --git a/projects/application-services/config b/projects/application-services/config index 3b05d85..22bfa06 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 77.0.2 -git_hash: dd09c25f14dbf45f1637ed8dca2d1e5ff668479f +version: 79.0.0 +git_hash: 89ea9cfa6eaa0763d17ec9aa04098839d028004c git_url: https://github.com/mozilla/application-services git_submodule: 1 @@ -80,18 +80,17 @@ input_files: enable: '[% !c("var/fetch_gradle_dependencies") %]' # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('version') %].tar.bz2 - sha256sum: 313c1e9b164ce9905eafe29a913edb617379e6d153ce28fa751d9f544e6e87c8 + sha256sum: 386f0f94452f4a6185e9db094a157c67684c259b38e6f6d62805eaed30f20e58 - filename: no-git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: target.patch - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' - - filename: 0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch steps: list_toolchain_updates: - git_hash: 'v77.0.2' + git_hash: 'v79.0.0' input_files: [] var: container: diff --git a/projects/nss/config b/projects/nss/config index fb84009..0224dca 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-with-nspr-[% c("nspr_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.59 -nspr_version: 4.29 +version: 3.65 +nspr_version: 4.30 var: container: use_container: 1 @@ -19,7 +19,7 @@ input_files: project: ninja - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version") | replace("\\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' name: nss - sha256sum: 2e2c09c17b1c9f43a2f0a5d83a30a712bff3016d2b7cf5a3dd904847292607ae + sha256sum: 5da275c751d0a4f624089d4589ae68b0dfc9cb77bc846ef903fb819fbf678976 - filename: configure.patch - filename: config.patch - filename: bug_13028.patch

1 0