- tbb-commits - lists.torproject.org

[rbm/master] Add the ENV option
by boklm＠torproject.org 01 Mar '17

01 Mar '17

commit 1945b67fefbcf7b834b71275e301da06232f0241 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 1 14:53:34 2017 +0100 Add the ENV option Add the ENV option, allowing to define some default environment variables. --- NEWS | 2 ++ doc/rbm_config.asc | 7 +++++++ lib/RBM.pm | 4 ++++ rbm | 1 + test.pl | 1 + 5 files changed, 15 insertions(+) diff --git a/NEWS b/NEWS index 663a281..5de36e0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the ENV option + - Add the build_log option - Add support for optional local configuration file rbm.local.conf diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index a461b3d..48e505c 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -151,6 +151,13 @@ fetch:: repository is fetched only if the selected commit cannot be found in the local clone. The default is +if_needed+. +ENV:: + This option, defined in the workspace config, is a hash + containing the environment variables that will be defined + when rbm is starting. This is useful for defining variables + that can affect how the templates are processed (for instance + the +TZ+ variable if dates are used). + include::options_tar.asc[] arch:: diff --git a/lib/RBM.pm b/lib/RBM.pm index 2248b41..632a8ba 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -75,6 +75,10 @@ sub find_config_file { exit_error("Can't find config file"); } +sub set_default_env { + %ENV = (%ENV, %{$config->{ENV}}) if ref $config->{ENV} eq 'HASH'; +} + sub path { my ($path, $basedir) = @_; $basedir //= $config->{basedir}; diff --git a/rbm b/rbm index 050cff5..9a8ccf2 100755 --- a/rbm +++ b/rbm @@ -198,6 +198,7 @@ if (@ARGV == 0 || !$actions{$ARGV[0]}) { } usage('usage', $ARGV[0]) if grep { $_ eq '--help' } @ARGV[1..(@ARGV - 1)]; RBM::load_config unless $actions{$ARGV[0]}->{no_config}; +RBM::set_default_env unless $actions{$ARGV[0]}->{no_config}; $actions{$ARGV[0]}->{run}->(@ARGV); # vim: expandtab sw=4 diff --git a/test.pl b/test.pl index 64bffd7..2748614 100755 --- a/test.pl +++ b/test.pl @@ -19,6 +19,7 @@ sub set_step { BEGIN { use_ok('RBM') }; chdir 'test'; RBM::load_config; +RBM::set_default_env; ok($RBM::config, 'load config'); my @tests = (

1 0

[tor-browser-bundle/maint-6.5] Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge.
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit 9ad873914a661cc703a911b0a19296ef180e42be Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge. https://lists.torproject.org/pipermail/tor-project/2017-January/000906.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 7e0511a..a77a88e 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -35,4 +35,4 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[torbutton/master] Bug 21574.1: Add link for zh manual
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit bd579aa46f4bf7432b40e0c6aac56fa738462c50 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Feb 27 08:39:06 2017 -0800 Bug 21574.1: Add link for zh manual --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fca72b6..44f01f9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2446,7 +2446,7 @@ function torbutton_update_noscript_button() // Returns true if we should show the tor browser manual. function torbutton_show_torbrowser_manual() { - let availableLocales = ["en", "es", "fr", "pt"]; + let availableLocales = ["en", "es", "fr", "pt", "zh"]; let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2); return availableLocales.indexOf(shortLocale) >= 0; }

1 0

[torbutton/master] Bug 21574.2: Generate manual link dynamically
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit f46990b13f9807f52459fe027b73756d4b6f79f7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Feb 27 08:40:15 2017 -0800 Bug 21574.2: Generate manual link dynamically --- src/chrome/content/aboutTor/aboutTor.xhtml | 8 ++++++-- src/chrome/content/menu-overlay.xul | 2 +- src/chrome/locale/en/aboutTor.dtd | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6082588..e4050fc 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -23,10 +23,15 @@ href="chrome://torbutton/skin/aboutTor.css"/> <script type="text/javascript;version=1.7"> <![CDATA[ +Components.utils.import("resource://gre/modules/Services.jsm"); + function onLoad() { insertPropertyStrings(); + let locale = Services.prefs.getCharPref("general.useragent.locale"); + document.getElementById("manualLink").href = "https://tb-manual.torproject.org/" + locale; + document.addEventListener("AboutTorAdjustArrow", function() { adjustToolbarIconArrow(); }, false); @@ -141,7 +146,6 @@ function insertPropertyStrings() try { let kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; - Components.utils.import("resource://gre/modules/Services.jsm"); let gStringBundle = Services.strings.createBundle(kPropertiesURL); let s1 = gStringBundle.GetStringFromName("aboutTor.searchDDG.privacy.link"); let s2 = gStringBundle.GetStringFromName("aboutTor.searchDDG.search.link"); @@ -222,7 +226,7 @@ window.addEventListener("pageshow", function() { </a> </li> <li class="showForManual"> - <a href="&aboutTor.torbrowser_user_manual.link;"> + <a id="manualLink"> &aboutTor.torbrowser_user_manual.label; » </a> </li> diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 4970114..53654c5 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -22,6 +22,6 @@ position="1" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;" - oncommand="gBrowser.selectedTab = gBrowser.addTab('&aboutTor.torbrowser_user_manual.link;')" /> + oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.prefs.getCharPref('general.useragent.locale'))" /> </menupopup> </overlay> diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 8213ab9..676878e 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -31,7 +31,6 @@ <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/en-US"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">

1 0

[tor-browser-build/master] Re-zip the omni.ja files
by boklm＠torproject.org 27 Feb '17

27 Feb '17

commit 38863663120244e4becc66fe7a10cce92d8e639b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 27 17:46:28 2017 +0100 Re-zip the omni.ja files Re-zipping the omni.ja files is not needed to make them reproductible, however if we don't re-zip them, the files become corrupt when we update them using 'zip' (we are doing that when we update the 000-tor-browser.js preference file to set the locale) and firefox will silently fail to load some parts. --- projects/firefox/build | 17 +++++++++++++---- rbm.conf | 12 ++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 42752d1..7610510 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -146,10 +146,19 @@ do done [% END %] -# TODO: -# ~/build/re-dzip.sh Browser/omni.ja -# ~/build/re-dzip.sh Browser/webapprt/omni.ja -# ~/build/re-dzip.sh Browser/browser/omni.ja +# Re-zipping the omni.ja files is not needed to make them reproductible, +# however if we don't re-zip them, the files become corrupt when we +# update them using 'zip' and firefox will silently fail to load some +# parts. +[% IF c("var/windows") || c("var/linux") %] + [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %] + [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] + [% IF c("var/linux") %][% c("var/rezip", { rezip_file => 'Browser/webapprt/omni.ja' }) %][% END %] +[% ELSIF c("var/osx") %] + [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] + [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/webapprt/omni.ja' }) %] + [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/browser/omni.ja' }) %] +[% END %] [% IF c("var/windows") %] cp $rootdir/msvcr100.dll Browser/ diff --git a/rbm.conf b/rbm.conf index e9f7b6d..b137595 100644 --- a/rbm.conf +++ b/rbm.conf @@ -54,6 +54,18 @@ var: sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]' + rezip: | + rezip_tmpdir=$(mktemp -d) + mkdir -p "$rezip_tmpdir/z" + unzip -d "$rezip_tmpdir/z" -- [% c("rezip_file") %] || [ $? -lt 3 ] + pushd "$rezip_tmpdir/z" + [% c("zip", { + zip_src => [ '.' ], + zip_args => '$rezip_tmpdir/new.zip', + }) %] + popd + mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %] + rm -Rf "$rezip_tmpdir" targets: notarget: linux-x86_64

1 0

[tor-browser-build/master] Fix typo in firefox --enable-update-channel option
by boklm＠torproject.org 26 Feb '17

26 Feb '17

commit 369b646afae308ec3f501b60177bafbe58298374 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 26 19:48:18 2017 +0100 Fix typo in firefox --enable-update-channel option The value of the --enable-update-channel option was empty because of this typo. --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index a8ef12f..42752d1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -79,7 +79,7 @@ export CC='gcc -m32' rm -f configure rm -f js/src/configure -make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --enable-update-channel=[% c("var/torbrowser_update_chanel") %] --enable-bundled-fonts" +make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true

1 0

[tor-browser-build/master] Fix multi lingual preferences
by boklm＠torproject.org 26 Feb '17

26 Feb '17

commit 6f779ad8eaab011f0f59775782543731bcd9ead3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 26 19:32:05 2017 +0100 Fix multi lingual preferences --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f952a95..4eeb350 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -122,7 +122,7 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/us popd [% END %] -[% IF c("var/multi_lingual") %] +[% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH echo 'pref("intl.locale.matchOS", false);' >> $TBDIR/$EXTOVERRIDESPATH [% END %]

1 0

[tor-browser-build/master] Remove -specs=msvcr100.spec from default flags on Windows
by boklm＠torproject.org 26 Feb '17

26 Feb '17

commit a89da94ef4e316091e97e9b87ca1b759330093ed Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 26 20:04:21 2017 +0100 Remove -specs=msvcr100.spec from default flags on Windows Doing the same as what we are currently doing in gitian, this flag is now used only in the firefox build. --- rbm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index 5a29308..e9f7b6d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -124,8 +124,8 @@ targets: windows: 1 osname: windows-i686 configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec [% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec [% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' + CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' + LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[tor-browser-build/master] Adding comment for binutils patch
by gk＠torproject.org 24 Feb '17

24 Feb '17

commit 0e8a1c7f0355cf074435bbc4fb5c9fd506ffc21f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 24 09:32:01 2017 +0000 Adding comment for binutils patch --- projects/binutils/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/binutils/build b/projects/binutils/build index b7a6e72..cdd01a6 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -23,6 +23,7 @@ cd [% project %]-[% c("version") %] sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch +# Zeroing timestamps in PE headers reliably, see bug 12753. patch -p1 < ../peXXigen.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %]

1 0

[tor-browser-bundle/hardened-builds] Bug 21536: Remove scramblesuit bridge
by gk＠torproject.org 23 Feb '17

23 Feb '17

commit 258def4ae69ed4e6328f97319ff9dbcdd0d30a9f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 23 13:46:14 2017 +0000 Bug 21536: Remove scramblesuit bridge --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index c56d316..61e2a9e 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -13,8 +13,6 @@ pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); - pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");

1 0