- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.4.0esr-7.5-1] Bug 13398: at startup, browser gleans user FULL NAME (real name, given name) from O/S
by gk＠torproject.org 04 Oct '17

04 Oct '17

commit e3b99866dbdc29a2949d0a53806b99a94f34cc73 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Sep 29 15:35:31 2017 -0700 Bug 13398: at startup, browser gleans user FULL NAME (real name, given name) from O/S ifdef'd out offending code in each platform based on existance of TOR_BROWSER_VERSION and return empty string instead. --- toolkit/components/startup/nsUserInfoMac.mm | 24 ++++++++++++++++++++---- toolkit/components/startup/nsUserInfoUnix.cpp | 20 ++++++++++++++++++++ toolkit/components/startup/nsUserInfoWin.cpp | 22 ++++++++++++++++++++-- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/toolkit/components/startup/nsUserInfoMac.mm b/toolkit/components/startup/nsUserInfoMac.mm index 1895cf177353..175e9637c422 100644 --- a/toolkit/components/startup/nsUserInfoMac.mm +++ b/toolkit/components/startup/nsUserInfoMac.mm @@ -19,11 +19,14 @@ NS_IMETHODIMP nsUserInfo::GetFullname(char16_t **aFullname) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT - +#ifndef TOR_BROWSER_VERSION NS_ConvertUTF8toUTF16 fullName([NSFullUserName() UTF8String]); *aFullname = ToNewUnicode(fullName); return NS_OK; - +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT } @@ -31,11 +34,14 @@ NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT - +#ifndef TOR_BROWSER_VERSION nsAutoCString username([NSUserName() UTF8String]); *aUsername = ToNewCString(username); return NS_OK; - +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT } @@ -63,15 +69,21 @@ nsUserInfo::GetPrimaryEmailAddress(nsCString &aEmailAddress) NS_IMETHODIMP nsUserInfo::GetEmailAddress(char **aEmailAddress) { +#ifndef TOR_BROWSER_VERSION nsAutoCString email; if (NS_SUCCEEDED(GetPrimaryEmailAddress(email))) *aEmailAddress = ToNewCString(email); return NS_OK; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetDomain(char **aDomain) { +#ifndef TOR_BROWSER_VERSION nsAutoCString email; if (NS_SUCCEEDED(GetPrimaryEmailAddress(email))) { int32_t index = email.FindChar('@'); @@ -81,4 +93,8 @@ nsUserInfo::GetDomain(char **aDomain) } } return NS_OK; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } diff --git a/toolkit/components/startup/nsUserInfoUnix.cpp b/toolkit/components/startup/nsUserInfoUnix.cpp index 71bc46da2573..6c8b35443139 100644 --- a/toolkit/components/startup/nsUserInfoUnix.cpp +++ b/toolkit/components/startup/nsUserInfoUnix.cpp @@ -36,6 +36,7 @@ NS_IMPL_ISUPPORTS(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(char16_t **aFullname) { +#ifndef TOR_BROWSER_VERSION struct passwd *pw = nullptr; pw = getpwuid (geteuid()); @@ -76,11 +77,16 @@ nsUserInfo::GetFullname(char16_t **aFullname) return NS_OK; return NS_ERROR_FAILURE; +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetUsername(char * *aUsername) { +#ifndef TOR_BROWSER_VERSION struct passwd *pw = nullptr; // is this portable? those are POSIX compliant calls, but I need to check @@ -95,11 +101,16 @@ nsUserInfo::GetUsername(char * *aUsername) *aUsername = strdup(pw->pw_name); return NS_OK; +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetDomain(char * *aDomain) { +#ifndef TOR_BROWSER_VERSION nsresult rv = NS_ERROR_FAILURE; struct utsname buf; @@ -132,11 +143,16 @@ nsUserInfo::GetDomain(char * *aDomain) } return rv; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetEmailAddress(char * *aEmailAddress) { +#ifndef TOR_BROWSER_VERSION // use username + "@" + domain for the email address nsresult rv; @@ -163,5 +179,9 @@ nsUserInfo::GetEmailAddress(char * *aEmailAddress) *aEmailAddress = ToNewCString(emailAddress); return NS_OK; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif } diff --git a/toolkit/components/startup/nsUserInfoWin.cpp b/toolkit/components/startup/nsUserInfoWin.cpp index b27a2c483b1c..04552d7310f9 100644 --- a/toolkit/components/startup/nsUserInfoWin.cpp +++ b/toolkit/components/startup/nsUserInfoWin.cpp @@ -30,6 +30,7 @@ nsUserInfo::GetUsername(char **aUsername) { NS_ENSURE_ARG_POINTER(aUsername); *aUsername = nullptr; +#ifndef TOR_BROWSER_VERSION // ULEN is the max username length as defined in lmcons.h wchar_t username[UNLEN +1]; @@ -39,6 +40,10 @@ nsUserInfo::GetUsername(char **aUsername) *aUsername = ToNewUTF8String(nsDependentString(username)); return (*aUsername) ? NS_OK : NS_ERROR_FAILURE; +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -46,6 +51,7 @@ nsUserInfo::GetFullname(char16_t **aFullname) { NS_ENSURE_ARG_POINTER(aFullname); *aFullname = nullptr; +#ifndef TOR_BROWSER_VERSION wchar_t fullName[512]; DWORD size = mozilla::ArrayLength(fullName); @@ -91,6 +97,10 @@ nsUserInfo::GetFullname(char16_t **aFullname) } return (*aFullname) ? NS_OK : NS_ERROR_FAILURE; +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -98,7 +108,7 @@ nsUserInfo::GetDomain(char **aDomain) { NS_ENSURE_ARG_POINTER(aDomain); *aDomain = nullptr; - +#ifndef TOR_BROWSER_VERSION const DWORD level = 100; LPBYTE info; NET_API_STATUS status = NetWkstaGetInfo(nullptr, level, &info); @@ -110,6 +120,10 @@ nsUserInfo::GetDomain(char **aDomain) } return (*aDomain) ? NS_OK : NS_ERROR_FAILURE; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -117,7 +131,7 @@ nsUserInfo::GetEmailAddress(char **aEmailAddress) { NS_ENSURE_ARG_POINTER(aEmailAddress); *aEmailAddress = nullptr; - +#ifndef TOR_BROWSER_VERSION // RFC3696 says max length of an email address is 254 wchar_t emailAddress[255]; DWORD size = mozilla::ArrayLength(emailAddress); @@ -130,4 +144,8 @@ nsUserInfo::GetEmailAddress(char **aEmailAddress) *aEmailAddress = ToNewUTF8String(nsDependentString(emailAddress)); return (*aEmailAddress) ? NS_OK : NS_ERROR_FAILURE; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif }

1 0

[tor-browser-build/master] Fold in 7.0.6 changelog and update release date
by gk＠torproject.org 03 Oct '17

03 Oct '17

commit 36600281908287e26153315dc2a3e7aa2e6d06e3 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 3 06:25:42 2017 +0000 Fold in 7.0.6 changelog and update release date --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 430aa8c..56fcb64 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 7.5a5 -- September 27 2017 +Tor Browser 7.5a5 -- September 28 2017 * All Platforms * Update Firefox to 52.4.0esr * Update Tor to 0.3.2.1-alpha @@ -35,6 +35,20 @@ Tor Browser 7.5a5 -- September 27 2017 * All Platforms * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build +Tor Browser 7.0.6 -- September 28 2017 + * All Platforms + * Update Firefox to 52.4.0esr + * Update Tor to 0.3.1.7 + * Update Torbutton to 1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + * Update HTTPS-Everywhere to 2017.9.12 + * Update NoScript to 5.0.10 + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 23393: Don't crash all tabs when closing one tab + * OS X + * Bug 23404: Add missing Noto Sans Buginese font to the macOS whitelist + Tor Browser 7.0.5 -- September 4 2017 * All Platforms * Update Torbutton to 1.9.7.6

1 0

[tor-browser-build/master] Bug 23384: install and configure unattended-upgrades on build-sunet-a.torproject.net
by boklm＠torproject.org 02 Oct '17

02 Oct '17

commit fd97762cb0924eea137896425eab788daef6ca8d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 2 18:05:14 2017 +0200 Bug 23384: install and configure unattended-upgrades on build-sunet-a.torproject.net --- .../roles/unattended-upgrades/defaults/main.yml | 2 + .../roles/unattended-upgrades/tasks/main.yml | 18 +++++ .../unattended-upgrades/templates/20auto-upgrades | 2 + .../templates/50unattended-upgrades | 92 ++++++++++++++++++++++ tools/ansible/tbb-build.yml | 1 + 5 files changed, 115 insertions(+) diff --git a/tools/ansible/roles/unattended-upgrades/defaults/main.yml b/tools/ansible/roles/unattended-upgrades/defaults/main.yml new file mode 100644 index 0000000..f6351a7 --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/defaults/main.yml @@ -0,0 +1,2 @@ +--- +unattended_upgrade_mail: 'boklm(a)mars-attacks.org' diff --git a/tools/ansible/roles/unattended-upgrades/tasks/main.yml b/tools/ansible/roles/unattended-upgrades/tasks/main.yml new file mode 100644 index 0000000..de0892b --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/tasks/main.yml @@ -0,0 +1,18 @@ +--- + +- name: Install unattended-updates + apt: + name: unattended-upgrades + state: present + +- name: Install apt-listchanges + apt: + name: apt-listchanges + state: present + +- name: create /etc/apt/apt.conf.d/50unattended-upgrades + template: src=50unattended-upgrades dest=/etc/apt/apt.conf.d/50unattended-upgrades mode=0644 + +- name: create /etc/apt/apt.conf.d/20auto-upgrades + template: src=20auto-upgrades dest=/etc/apt/apt.conf.d/20auto-upgrades mode=0644 + diff --git a/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades b/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades new file mode 100644 index 0000000..8d6d7c8 --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades @@ -0,0 +1,2 @@ +APT::Periodic::Update-Package-Lists "1"; +APT::Periodic::Unattended-Upgrade "1"; diff --git a/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades b/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades new file mode 100644 index 0000000..d4904ab --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades @@ -0,0 +1,92 @@ +// Unattended-Upgrade::Origins-Pattern controls which packages are +// upgraded. +// +// Lines below have the format format is "keyword=value,...". A +// package will be upgraded only if the values in its metadata match +// all the supplied keywords in a line. (In other words, omitted +// keywords are wild cards.) The keywords originate from the Release +// file, but several aliases are accepted. The accepted keywords are: +// a,archive,suite (eg, "stable") +// c,component (eg, "main", "crontrib", "non-free") +// l,label (eg, "Debian", "Debian-Security") +// o,origin (eg, "Debian", "Unofficial Multimedia Packages") +// n,codename (eg, "jessie", "jessie-updates") +// site (eg, "http.debian.net") +// The available values on the system are printed by the command +// "apt-cache policy", and can be debugged by running +// "unattended-upgrades -d" and looking at the log file. +// +// Within lines unattended-upgrades allows 2 macros whose values are +// derived from /etc/debian_version: +// ${distro_id} Installed origin. +// ${distro_codename} Installed codename (eg, "jessie") +Unattended-Upgrade::Origins-Pattern { + // Codename based matching: + // This will follow the migration of a release through different + // archives (e.g. from testing to stable and later oldstable). +// "o=Debian,n=jessie"; +// "o=Debian,n=jessie-updates"; +// "o=Debian,n=jessie-proposed-updates"; +// "o=Debian,n=jessie,l=Debian-Security"; + + // Archive or Suite based matching: + // Note that this will silently match a different release after + // migration to the specified archive (e.g. testing becomes the + // new stable). +// "o=Debian,a=stable"; +// "o=Debian,a=stable-updates"; +// "o=Debian,a=proposed-updates"; + "origin=Debian,codename=${distro_codename},label=Debian-Security"; +}; + +// List of packages to not update (regexp are supported) +Unattended-Upgrade::Package-Blacklist { +// "vim"; +// "libc6"; +// "libc6-dev"; +// "libc6-i686"; +}; + +// This option allows you to control if on a unclean dpkg exit +// unattended-upgrades will automatically run +// dpkg --force-confold --configure -a +// The default is true, to ensure updates keep getting installed +//Unattended-Upgrade::AutoFixInterruptedDpkg "false"; + +// Split the upgrade into the smallest possible chunks so that +// they can be interrupted with SIGUSR1. This makes the upgrade +// a bit slower but it has the benefit that shutdown while a upgrade +// is running is possible (with a small delay) +//Unattended-Upgrade::MinimalSteps "true"; + +// Install all unattended-upgrades when the machine is shuting down +// instead of doing it in the background while the machine is running +// This will (obviously) make shutdown slower +//Unattended-Upgrade::InstallOnShutdown "true"; + +// Send email to this address for problems or packages upgrades +// If empty or unset then no email is sent, make sure that you +// have a working mail setup on your system. A package that provides +// 'mailx' must be installed. E.g. "user(a)example.com" +Unattended-Upgrade::Mail "{{ unattended_upgrade_mail }}"; + +// Set this value to "true" to get emails only on errors. Default +// is to always send a mail if Unattended-Upgrade::Mail is set +//Unattended-Upgrade::MailOnlyOnError "true"; + +// Do automatic removal of new unused dependencies after the upgrade +// (equivalent to apt-get autoremove) +//Unattended-Upgrade::Remove-Unused-Dependencies "false"; + +// Automatically reboot *WITHOUT CONFIRMATION* if +// the file /var/run/reboot-required is found after the upgrade +//Unattended-Upgrade::Automatic-Reboot "false"; + +// If automatic reboot is enabled and needed, reboot at the specific +// time instead of immediately +// Default: "now" +//Unattended-Upgrade::Automatic-Reboot-Time "02:00"; + +// Use apt bandwidth limit feature, this example limits the download +// speed to 70kb/sec +//Acquire::http::Dl-Limit "70"; diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index 9f76b67..3d9f543 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -6,3 +6,4 @@ - role: useful-packages - role: tbb-team - role: mta + - role: unattended-upgrades

1 0

[tor-browser-build/master] Bug 23384: install dma (lightweight mail transport agent) on build-sunet-a.torproject.net
by boklm＠torproject.org 02 Oct '17

02 Oct '17

commit 39722d6b59c200710025b899e5f544a69bbeb943 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 2 17:27:54 2017 +0200 Bug 23384: install dma (lightweight mail transport agent) on build-sunet-a.torproject.net --- tools/ansible/roles/mta/tasks/main.yml | 6 ++++++ tools/ansible/tbb-build.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml new file mode 100644 index 0000000..de469d8 --- /dev/null +++ b/tools/ansible/roles/mta/tasks/main.yml @@ -0,0 +1,6 @@ +--- + +- name: Install dma (DragonFly Mail Agent) + apt: + name: dma + state: present diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index e74e665..9f76b67 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -5,3 +5,4 @@ - role: tbb-builder - role: useful-packages - role: tbb-team + - role: mta

1 0

[tor-browser-build/master] Bump sandboxed-tor-browser version
by gk＠torproject.org 29 Sep '17

29 Sep '17

commit 712991345d023d987631a35998df6cf8736b5a2e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 29 08:55:41 2017 +0000 Bump sandboxed-tor-browser version This is mainly for shipping a new version right after release as our alpha release broke 0.0.13 (see: #23692). --- projects/sandbox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/sandbox/config b/projects/sandbox/config index f9b0f76..0a79ac9 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.13 +version: 0.0.14 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Bug 22501: Requests via javascript: violate FPI
by gk＠torproject.org 29 Sep '17

29 Sep '17

commit ee2f06091d76272c7b629265d8c0a67c3d3b07e1 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Sep 28 12:32:58 2017 -0700 Bug 22501: Requests via javascript: violate FPI By default NoScript attempts to find URLs in "javascript:.*" strings found in <a> element href atributes and in <option> element value attributes. When such links (or options) are clicked/selected, NoScript attempts to navigate the page to said URL. These navigations are treated as intternal requests, and get pacced onto the catch-all circuit. This behaviour can be turned off by disabling the 'noscript.fixLinks' flag, so we do so for each Tor Browser build target's extension-overrides.js. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index ded3d5b..c610aff 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -38,6 +38,7 @@ pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); pref("noscript.allowWhitelistUpdates", false); +pref("noscript.fixLinks", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index ded3d5b..c610aff 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -38,6 +38,7 @@ pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); pref("noscript.allowWhitelistUpdates", false); +pref("noscript.fixLinks", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index ded3d5b..c610aff 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -38,6 +38,7 @@ pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); pref("noscript.allowWhitelistUpdates", false); +pref("noscript.fixLinks", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false);

1 0

[tor-browser-build/master] Bug 23680: document the types of builds (testbuild/nightly/alpha) in README.HACKING
by gk＠torproject.org 28 Sep '17

28 Sep '17

commit 2d5b42b7b8bea03bf55fc3ad2c1ea993e18af191 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 28 12:17:12 2017 +0200 Bug 23680: document the types of builds (testbuild/nightly/alpha) in README.HACKING --- README.HACKING | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.HACKING b/README.HACKING index e328ea1..d9ebf63 100644 --- a/README.HACKING +++ b/README.HACKING @@ -238,6 +238,10 @@ the new commits. If you want to fetch new commits automatically when starting a new build you can add a "fetch: 1" line to projects/firefox/config. +Remember that the git_hash option has different definitions for alpha +and nightly builds, so you should modify the right one depending on +what type of build you are doing (see also the "Types of builds" section). + The Firefox mozconfig files --------------------------- @@ -293,3 +297,20 @@ For example, if you want to try a Linux x86_64 alpha build, you can run: $ /path_to_rbm/rbm build release --target alpha --target \ torbrowser-linux-x86_64 + +Types of builds: nightly, alpha, release and testbuild +------------------------------------------------------ + +The testbuild makefile target allows you to do a build quickly in the +testbuild directory, skipping the generation of all the locales and the +mar files. This is useful during development. + +By default the testbuild is based on the alpha build. All the options +can have a different definition for the alpha, release and nightly builds. +Usually the git_hash option has a different definition for the nightly +builds in order to point to the master branch. + +If you want your testbuild target to create builds based on nightly +rather than alpha, you can edit your rbm.local.conf file and uncomment +the targets/torbrowser-testbuild definition. +

1 0

[tor-browser-build/master] Bug 23630: Clarify README.HACKING on using a firefox git repository
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit 43e5d8803933af80e6e71005a5f64338c91680d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 25 18:10:04 2017 +0200 Bug 23630: Clarify README.HACKING on using a firefox git repository --- README.HACKING | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.HACKING b/README.HACKING index 31b8352..e328ea1 100644 --- a/README.HACKING +++ b/README.HACKING @@ -218,8 +218,25 @@ build with the patch. As an alternative, if you have your patch in a git repository, you can edit projects/firefox/config to change the git_url option to point to your git repository, and change the git_hash option to point to the -commit you want to build. You will also need to comment the -'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). +commit you want to build. If the new git_hash option is not pointing to +a signed tag, you will also need to comment the 'tag_gpg_id: 1' line. +The git_hash option can point to a tag, a commit, a branch or anything +that is understood by git. + +If you specify a branch in the git_hash option, you don't need to prefix +it with a git remote name as all branches from the git repository +selected in the git_url option are created as local branches. + +If you want to work on a local git repository, it is not a good idea to +work on the git_clones/firefox repository directly. Instead you should +create a separate git repository and update the git_url option with a +file:// URL pointing to your repository. + +After changing the git_url option or when new commits have been added +to a branch, you should run "make fetch" before starting a build to get +the new commits. If you want to fetch new commits automatically when +starting a new build you can add a "fetch: 1" line to +projects/firefox/config. The Firefox mozconfig files

1 0

[tor-browser-build/master] Preparing a -build5
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit 8eeb8c032e450b15cc4151409b1baa533db33364 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 26 09:07:46 2017 +0000 Preparing a -build5 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6757422..0b0193d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build4' + torbrowser_build: 'build5' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 23654: fix ja dmg file name
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit f42778f91a144375f29b2f584073e3b63b564553 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 26 10:46:38 2017 +0200 Bug 23654: fix ja dmg file name --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 31c2d6d..6540245 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -327,6 +327,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ tar_args => '-cJf $OUTDIR/tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.tar.xz', }) %] [% ELSIF c("var/osx") %] + [% # Rename the Japanese bundle to not confuse users + IF lang == 'ja-JP-mac'; + SET lang = 'ja'; + END; -%] [% c('var/ddmg', { dmg_src => tbdir, dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg',

1 0