April 2019 - tor-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25623_v4'
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit d869dcdece30316dedbb14045d49ec3f9a71b648 Merge: 893a482 56ba67b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 06:48:43 2019 +0000 Merge remote-tracking branch 'boklm/bug_25623_v4' projects/common/how-to-create-gradle-dependencies-list.txt | 3 ++- projects/common/runc-config.json | 6 ++++++ rbm.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25623: Disable network during build
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 56ba67b3b6345fc70d42567d03b0ff841fe38d3e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 13 13:20:33 2019 +0100 Bug 25623: Disable network during build --- projects/common/how-to-create-gradle-dependencies-list.txt | 3 ++- projects/common/runc-config.json | 6 ++++++ rbm.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index ef816d0..d980ba2 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -6,7 +6,8 @@ file: export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" -and rerun the build. +then allow network access during the build by setting +var/container/disable_network/build to 0 in rbm.conf, and rerun the build. Dependent artifacts will show up as downloads in the logs. You can pull out these dependencies into a list with the following command (replacing diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index e75c13d..60dfa6c 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -238,6 +238,12 @@ { "type": "uts" }, +[% IF c("var/container/disable_network/" _ c("exec_name")) -%] + { + "type": "network", + "path": "/var/run/netns/rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]" + }, +[% END -%] { "type": "mount" } diff --git a/rbm.conf b/rbm.conf index 32b1f37..f31e5db 100644 --- a/rbm.conf +++ b/rbm.conf @@ -51,6 +51,9 @@ var: container: dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm + disable_network: + # disable network in the build scripts + build: 1 input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%] [% c("input_files_by_name/" _ file) %] @@ -408,7 +411,13 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF + [% IF c("var/container/disable_network/" _ c("exec_name")) -%] + sudo ip netns add 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' + [% END -%] sudo runc [% IF c("var_p/runc100") %]run[% ELSE %]start[% END %] -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] + [% IF c("var/container/disable_network/" _ c("exec_name")) -%] + sudo ip netns delete 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' + [% END -%] remote_put: | #!/bin/sh

1 0

[tor-browser-spec/master] Bug 29949: Update processes/ReleaseProcess for new website
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 49d3763e98acadd794f814e972d4a4fb2242f613 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 29 13:11:58 2019 +0100 Bug 29949: Update processes/ReleaseProcess for new website --- processes/ReleaseProcess | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index a9c7422..9a8cb16 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -140,15 +140,15 @@ # https://hg.mozilla.org/releases/mozilla-esr60/graph/) #. Update website's torbrowser versions file in the website git - cd webwml + cd tpo torsocks git pull origin # Update `version-win32-stable` as well if we include a new stable tor # version. See: #14152. # Update the release date (via releasedate-torbrowserbundle*). See: #8968. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. - vim ./include/versions.wmi ./projects/torbrowser/RecommendedTBBVersions - git commit include/versions.wmi projects/torbrowser/RecommendedTBBVersions -m "Add new Tor Browser version" + vim databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr + git commit databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr -m "Add new Tor Browser version" torsocks git push origin master:master cd .. @@ -191,10 +191,10 @@ # update responses before doing this, so that people have a chance to see # the Firefox notification first before their browser starts weirdly blinking # at them. - cd webwml + cd tpo torsocks git pull origin # Now it's time to remove the obsolete version(s) - vim ./projects/torbrowser/RecommendedTBBVersions - git commit projects/torbrowser/RecommendedTBBVersions -m "Deprecate old Tor Browser version" + vim content/projects/torbrowser/RecommendedTBBVersions/contents.lr + git commit content/projects/torbrowser/RecommendedTBBVersions/contents.lr -m "Deprecate old Tor Browser version" torsocks git push origin master:master cd ..

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 01 Apr '19

01 Apr '19

commit f3a57cc6ab39a7e966c4d959da1d749362c4ca9d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 06:20:41 2019 +0000 Update translations for tpo-web --- contents+tr.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index cbc00d52d..84e99ffdb 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -341,6 +341,8 @@ msgid "" "That's why in October 2002 when the Tor network was initially deployed, its " "code was released under a free and open software license." msgstr "" +"Bu nedenle Ekim 2002’de Tor ağı ilk kez yayınlandığında, program kaynak kodu" +" özgür ve açık bir yazılım lisansı altında yayınlandı." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0