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

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/261'
by gk＠torproject.org 09 Apr '21

09 Apr '21

commit 8506181dd6ad508a0cbdd3836f4da640329adee2 Merge: 84363aa 60ce4da Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 9 19:24:55 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/261' README | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40273: Add libdatetime-perl to the list of dependencies
by gk＠torproject.org 09 Apr '21

09 Apr '21

commit 60ce4daf57e76447f848c1fc460036ea1b895602 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 9 17:58:05 2021 +0200 Bug 40273: Add libdatetime-perl to the list of dependencies --- README | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index 8ebccf6..1582743 100644 --- a/README +++ b/README @@ -30,10 +30,11 @@ You also need a few perl modules installed: - Digest::SHA - Data::UUID - Data::Dump +- DateTime If you are running Debian or Ubuntu, you can install them with: -# apt-get install libyaml-libyaml-perl libtemplate-perl \ +# apt-get install libyaml-libyaml-perl libtemplate-perl libdatetime-perl \ libio-handle-util-perl libio-all-perl \ libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \

1 0

[tor-browser-build/master] Release preparations for 10.5a14
by gk＠torproject.org 09 Apr '21

09 Apr '21

commit 84363aa2e6cc52298f1194d7b6708739b0bf7559 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 9 17:32:50 2021 +0000 Release preparations for 10.5a14 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/geckoview/config | 2 +- projects/tba-translation/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- rbm.conf | 4 ++-- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 19d087a..1abd993 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/geckoview/config b/projects/geckoview/config index f8c97e5..d9bc3f8 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 76c8d3f..73b5369 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 75a88b97c88d73d0d94a962a75703f0c33f8087c +git_hash: 0480d9e3ada42bfb02a77be59a54682ce2179cff version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 55b98a3..f1a094a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,13 @@ +Tor Browser 10.5a14 -- April 11 2021 + * All Platforms + * Update NoScript to 11.2.4 + * Translations update + * Bug 40261: Bump versions of snowflake and webrtc [tor-browser-build] + * Bug 40263: Update domain front for Snowflake [tor-browser-build] + * Bug 40390: Add Burmese as a new locale [tor-browser] + * Windows + OS X + Linux + * Bug 40007: Update domain fronting config for Moat [tor-launcher] + Tor Browser 10.5a13 -- March 24 2021 * Windows + OS X + Linux * Update Firefox to 78.9.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 29eb20f..58cf4bc 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -78,9 +78,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae + sha256sum: 278ee526d7c3ce5236c1a04aa5b6605c81b82399b846e43cdf6f93f11fef1ec9 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 5413e9a..1ebf3e1 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.27 +version: 0.2.28 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 8c577a0..8751f7a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.5a13' + torbrowser_version: '10.5a14' torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.5a11 + - 10.5a13 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-87.0-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 09 Apr '21

09 Apr '21

commit 60442d76fa4816d0f53bb92dfb24a0b9a43183ae Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 9 18:11:05 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 772716932a2d..5264bddf8bc7 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 772716932a2dd127793b47e91c10691c631b09f4 +Subproject commit 5264bddf8bc71cbb4e88921b55e7b95fa4522b69

1 0

[community/master] Add windows instructions: snowflake option, final notes, and fix styling.
by gus＠torproject.org 09 Apr '21

09 Apr '21

commit d7774dc3b1f2ce6563bf00a60a2c37d6b9a453a2 Author: gus <gus(a)torproject.org> Date: Fri Apr 9 11:54:59 2021 -0300 Add windows instructions: snowflake option, final notes, and fix styling. --- .../technical-setup/guard/windows/contents.lr | 34 ++++++++++++---------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/windows/contents.lr b/content/relay-operations/technical-setup/guard/windows/contents.lr index 8733b55..2dcd62d 100644 --- a/content/relay-operations/technical-setup/guard/windows/contents.lr +++ b/content/relay-operations/technical-setup/guard/windows/contents.lr @@ -2,13 +2,24 @@ _model: page --- color: primary --- -title: Windows +title: Windows 10 +--- +html: two-columns-page.html +--- +key: 8 +--- +section: Middle/Guard relay +--- +section_id: relay-operations +--- +subtitle: How to deploy a middle/Guard relay on Windows --- body: -# Relay setup guide for Windows 10 -Setting up a Windows system as a relay requires performing a few simple steps to set up a user account, download the expert bundle, implement a torrc configuration file and start up Tor from the command line. Below are detailed instructions on how to perform these steps - please ensure you follow them very carefully, and make any of the necessary modifications outlined along the way. +**Note: You should only run a Windows relay if you can run it 24/7. If the operator is unable to guarantee that, a [Snowflake](https://snowflake.torproject.org/) is a better way to contribute resources.** +Setting up a Windows system as a relay requires performing a few simple steps to set up a user account, download the expert bundle, implement a torrc configuration file and start up Tor from the command line. +Below are detailed instructions on how to perform these steps - please ensure you follow them very carefully, and make any of the necessary modifications outlined along the way. # 1. Creating a user account for Tor First you will need to create a new account to allow Tor to run isolated from your personal configuration as well as have manageable system permissions. @@ -41,7 +52,6 @@ The next step is to download and install Windows Expert bundle as well as set up ``` #Change the nickname "myNiceRelay" to a name that you like Nickname myNiceRelay - ORPort 9001 ExitRelay 0 SocksPort 0 @@ -76,14 +86,8 @@ There are two methods for starting up your relay for the first time depending on 3. You should now see Tor starting up in your terminal. Wait until its finished bootstrapping. 4. After a short period it should publish its OrPort, and you will be successfully relaying traffic for the Tor Network. * **Notice:** Depending on your systems settings, Tor may fail to start and produce an error indicating it is unable to create files. If this occurs, simply open the Windows Defender Security Center and select "App & browser control". Add the tor.exe file to the permissions list, then rerun `tor.exe` from the command line. Tor should now start up normally. ---- -html: two-columns-page.html ---- -key: 8 ---- -section: Middle/Guard relay ---- -section_id: relay-operations ---- -subtitle: How to deploy a middle/Guard relay on Windows ---- + +## 4. Final notes + +If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/). +If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.

1 0

[community/master] Relay guide for Windows
by gus＠torproject.org 09 Apr '21

09 Apr '21

commit 4dbf1a2f44a92da289f107a6c526fdc316411163 Author: Sehrish Aslam <66127574+SehrishHussain(a)users.noreply.github.com> Date: Wed Apr 7 22:40:20 2021 +0500 Relay guide for Windows Added relay guide for Windows Made suggested corrections Made corrections, and divided into simple sections for translation. Removed trailing spaces Squashed last two commits Final Squashed all three commits --- .../technical-setup/guard/windows/contents.lr | 89 ++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/content/relay-operations/technical-setup/guard/windows/contents.lr b/content/relay-operations/technical-setup/guard/windows/contents.lr new file mode 100644 index 0000000..8733b55 --- /dev/null +++ b/content/relay-operations/technical-setup/guard/windows/contents.lr @@ -0,0 +1,89 @@ +_model: page +--- +color: primary +--- +title: Windows +--- +body: +# Relay setup guide for Windows 10 + +Setting up a Windows system as a relay requires performing a few simple steps to set up a user account, download the expert bundle, implement a torrc configuration file and start up Tor from the command line. Below are detailed instructions on how to perform these steps - please ensure you follow them very carefully, and make any of the necessary modifications outlined along the way. + + +# 1. Creating a user account for Tor +First you will need to create a new account to allow Tor to run isolated from your personal configuration as well as have manageable system permissions. + +1. To begin, open your Control Panel and select 'Accounts'. +2. On the left-side menu, select 'Family & other people'. +3. Beside the 'Add another user to this PC' subheader, click the large `+` sign. +4. A panel will now appear asking for the Windows account information. On the bottom, select the small text that states "I do not have this users sign-in information". +5. On the next panel, select the similar text on the bottom stating "Set up user without using a Microsoft account". +6. Enter a username for the user. Anything you like is fine, though within this guide the username `torrelay` will be used. Then enter a strong password and continue. + +# 2. Downloading and configuring the Windows Expert bundle + +## 2.1 Downloading + +The next step is to download and install Windows Expert bundle as well as set up your torrc file. + +1. Head over to [Download Tor Source code]( https://www.torproject.org/download/tor/) and scroll down to select 'Windows Expert Bundle'. +2. Head to your `C:\Users\torrelay\` directory. +3. Create a folder called `tor`. +*(Optional. A custom path can be used, though you will have to make necessary modifications in the following steps.) + +## 2.2 Configuration + +1. Unpack the zipped Expert bundle into your newly created Tor directory. Two files will be placed there; one called `Tor`, and the other `Data`. +2. You will now need to create a torrc file to define the ruleset of your relay. +3. The default directory path for this file is `C:\Users\torrelay\AppData\Roaming\tor\torrc`, though you can specify a custom location at commandline startup with the `-f` flag. (More below) +4. Open up your newly created `torrc` file in your text editor and populate it with the following contents: + +``` +#Change the nickname "myNiceRelay" to a name that you like +Nickname myNiceRelay + +ORPort 9001 +ExitRelay 0 +SocksPort 0 +#Paths assume you extracted to C:\Users\torrelay\tor - if you +#extracted elsewhere or used a different username, adjust the +#paths accordingly +DataDirectory C:\Users\torrelay\tor\Data +Log notice file C:\Users\torrelay\tor\log\notices.log +GeoIPFile C:\Users\torrelay\tor\Data\Tor\geoip +GeoIPv6File C:\Users\torrelay\tor\Data\Tor\geoip6 +#Put your email below - Note that it will be published on the metrics page +ContactInfo tor-operator@your-emailaddress-domain +``` + +Make sure everything is filled in correctly, then save and exit. + +# 3. Starting up your relay + +There are two methods for starting up your relay for the first time depending on your preferences and needs. + +### 3.1 Method 1: User interface + +1. Navigate to the directory you extracted Tors files. +2. Simply right-click on the `tor.exe` file and select 'Run as other user' from the drop-down menu, and enter the password for your Tor account when prompted. +* **Note:** Be sure **not** to click the 'Run as administrator' button - this is dangerous! + +### 3.2 Method 2: Command line + +1. Open your command prompt. Navigate to `C:\Users\user\torrelay\tor\Tor` with the command `cd C:\Users\user\torrelay\tor\Tor`. +2. Type `RUNAS /user:torrelay tor.exe` and press enter. If you have your `torrc` file somewhere other than the default location (Like the `home` folder), specify the path with the `-f` flag. +* Example: `RUNAS /user:torrelay tor.exe -f C:\Users\user\torrelay\tor\Tor\torrc` +3. You should now see Tor starting up in your terminal. Wait until its finished bootstrapping. +4. After a short period it should publish its OrPort, and you will be successfully relaying traffic for the Tor Network. + * **Notice:** Depending on your systems settings, Tor may fail to start and produce an error indicating it is unable to create files. If this occurs, simply open the Windows Defender Security Center and select "App & browser control". Add the tor.exe file to the permissions list, then rerun `tor.exe` from the command line. Tor should now start up normally. +--- +html: two-columns-page.html +--- +key: 8 +--- +section: Middle/Guard relay +--- +section_id: relay-operations +--- +subtitle: How to deploy a middle/Guard relay on Windows +---

1 0

[community/master] Remove line break
by gus＠torproject.org 09 Apr '21

09 Apr '21

commit 43b52d7657bf446d0ab912cc0deb193ab9be8dfd Author: gus <gus(a)torproject.org> Date: Fri Apr 9 11:13:52 2021 -0300 Remove line break --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 270e3ac..f31d12e 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -131,9 +131,7 @@ If your bridge is now running, check out the [post-install notes](https://commun --- html: two-columns-page.html --- -key: - -1 +key: 1 --- subtitle: How to deploy an obfs4 bridge on CentOS / RHEL / OpenSUSE ---

1 0

[community/master] arranged keys
by gus＠torproject.org 09 Apr '21

09 Apr '21

commit cd82bca90e177d2390382edf2ab89eb634a7f538 Author: kulsoomzahra <kulsoomzahra24(a)gmail.com> Date: Fri Apr 9 12:22:43 2021 +0530 arranged keys --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 2 +- .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/docker/contents.lr | 2 +- .../relay-operations/technical-setup/bridge/dragonflybsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/fedora/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/freebsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/netbsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/openbsd/contents.lr | 2 +- .../relay-operations/technical-setup/bridge/post-install/contents.lr | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 7701282..270e3ac 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -133,7 +133,7 @@ html: two-columns-page.html --- key: -2 +1 --- subtitle: How to deploy an obfs4 bridge on CentOS / RHEL / OpenSUSE --- diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index 4d25952..76926a9 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -86,7 +86,7 @@ If you are having trouble setting up your bridge, have a look at [our help secti If your bridge is now running, check out the [post-install notes](https://community.torproject.org/relay/setup/bridge/post-install/). --- -key: 1 +key: 2 --- html: two-columns-page.html --- diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 00e26a1..aaf89fc 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -76,7 +76,7 @@ If you are having trouble setting up your bridge, have a look at [our help secti --- html: two-columns-page.html --- -key: 5 +key: 3 --- subtitle: How to deploy an obfs4 bridge using a docker container --- diff --git a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr index 8a0c15e..1027a79 100644 --- a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr @@ -6,7 +6,7 @@ title: DragonflyBSD --- html: two-columns-page.html --- -key: 5 +key: 4 --- body: diff --git a/content/relay-operations/technical-setup/bridge/fedora/contents.lr b/content/relay-operations/technical-setup/bridge/fedora/contents.lr index 6708a92..095bac2 100644 --- a/content/relay-operations/technical-setup/bridge/fedora/contents.lr +++ b/content/relay-operations/technical-setup/bridge/fedora/contents.lr @@ -105,7 +105,7 @@ html: two-columns-page.html --- key: -2 +5 --- subtitle: How to deploy an obfs4 bridge on Fedora --- diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index 29baea0..5d182d8 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -6,7 +6,7 @@ title: FreeBSD --- html: two-columns-page.html --- -key: 3 +key: 6 --- body: diff --git a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr index a9799cd..c681497 100644 --- a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr @@ -6,7 +6,7 @@ title: NetBSD --- html: two-columns-page.html --- -key: 6 +key: 7 --- body: diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index d5ef072..0a60051 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -6,7 +6,7 @@ color: primary --- html: two-columns-page.html --- -key: 4 +key: 8 --- body: diff --git a/content/relay-operations/technical-setup/bridge/post-install/contents.lr b/content/relay-operations/technical-setup/bridge/post-install/contents.lr index 4abc2ea..e0aea26 100644 --- a/content/relay-operations/technical-setup/bridge/post-install/contents.lr +++ b/content/relay-operations/technical-setup/bridge/post-install/contents.lr @@ -21,7 +21,7 @@ Finally, you can monitor your obfs4 bridge's usage on [Relay Search](https://met --- html: two-columns-page.html --- -key: 6 +key: 9 --- subtitle: How to find your bridge in Relay Search and connect manually ---

1 0

[tor-browser-build/master] Pick up rbm fixes for #33991 and #40019
by gk＠torproject.org 09 Apr '21

09 Apr '21

commit c1bc5e42b0629782db6866bd64a6d185f50d36d4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 9 11:16:42 2021 +0000 Pick up rbm fixes for #33991 and #40019 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e010657..1ebbf5e 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e0106571c78a43d1de17f5282b711896750d8462 +Subproject commit 1ebbf5ee34239a58d91e59acd0c2c85e1900aceb

1 0

[rbm/master] Bug 40019: Print build finish date and build time in logs
by gk＠torproject.org 09 Apr '21

09 Apr '21

commit 1ebbf5ee34239a58d91e59acd0c2c85e1900aceb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 8 17:57:47 2021 +0200 Bug 40019: Print build finish date and build time in logs --- lib/RBM.pm | 35 +++++++++++++++++++++++++++++++---- test/.gitignore | 1 + test/projects/test-log/config | 9 +++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 1294b4e..a81a290 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -2,6 +2,7 @@ package RBM; use warnings; use strict; +use DateTime; use Path::Tiny; use Encode qw(encode); use Cwd qw(getcwd); @@ -999,6 +1000,24 @@ sub system_log { exec(@args); } +sub log_start_time { + my ($log_file, $script_name) = @_; + my $start_time = DateTime->now; + my $start_time_txt = $start_time->ymd . ' ' . $start_time->hms; + path($log_file)->append_utf8("Starting build (script: $script_name): $start_time_txt\n"); + return $start_time; +} + +sub log_end_time { + my ($log_file, $script_name, $start_time) = @_; + my $end_time = DateTime->now; + my $end_time_txt = $end_time->ymd . ' ' . $end_time->hms; + path($log_file)->append_utf8("Finishing build (script: $script_name): $end_time_txt\n"); + my $build_time = $end_time - $start_time; + my ($bth, $btm, $bts) = $build_time->in_units('hours', 'minutes', 'seconds'); + path($log_file)->append_utf8("Build time: $bth hours $btm minutes and $bts seconds\n"); +} + sub build_run { my ($project, $script_name, $options) = @_; my $old_step = $config->{step}; @@ -1076,8 +1095,10 @@ sub build_run { $build_log = rbm_path($build_log); unlink $build_log unless $append; make_path(dirname($build_log)); - my $now = localtime; - path($build_log)->append_utf8("Starting build: $now\n"); + if (!-f $build_log) { + my $now = localtime; + path($build_log)->append_utf8("Opening log file: $now\n"); + } print "Build log: $build_log\n"; } chdir $srcdir; @@ -1103,7 +1124,10 @@ sub build_run { exec_name => $s, exec_as_root => $scripts_root{$s}, }); - if (run_script($project, $cmd, sub { system_log($build_log, @_) }) != 0) { + my $start_time = log_start_time($build_log, $s) if $build_log ne '-'; + my $res = run_script($project, $cmd, sub { system_log($build_log, @_) }); + log_end_time($build_log, $s, $start_time) if $build_log ne '-'; + if ($res != 0) { $error = "Error running $script_name"; if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n"; @@ -1140,7 +1164,10 @@ sub build_run { foreach my $s (@scripts) { my $cmd = $scripts_root{$s} ? project_config($project, 'suexec', { suexec_cmd => "$srcdir/$s" }) : "$srcdir/$s"; - if (run_script($project, $cmd, sub { system_log($build_log, @_) }) != 0) { + my $start_time = log_start_time($build_log, $s) if $build_log ne '-'; + my $res = run_script($project, $cmd, sub { system_log($build_log, @_) }); + log_end_time($build_log, $s, $start_time) if $build_log ne '-'; + if ($res != 0) { $error = "Error running $script_name"; if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n"; diff --git a/test/.gitignore b/test/.gitignore index 21bd609..bf1211f 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,2 +1,3 @@ out hg_clones +logs diff --git a/test/projects/test-log/config b/test/projects/test-log/config new file mode 100644 index 0000000..27c40b7 --- /dev/null +++ b/test/projects/test-log/config @@ -0,0 +1,9 @@ +# this project can be used for checking that log files are working +filename: test-log +build_log: 'logs/test-log.txt' +build: | + #!/bin/sh + echo blablabla + sleep 2 + echo ttttttttt + echo Z > [% dest_dir %]/[% c('filename') %]

1 0