- tbb-commits - lists.torproject.org

[tor-browser-build/master] Update tor-browser.git commit
by boklm＠torproject.org 12 Apr '17

12 Apr '17

commit 2603af6dee70233dcc30f8717ee48a2b0121ff04 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 12 10:57:28 2017 +0200 Update tor-browser.git commit --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7e685e7..0b8995b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' ## There is no signed tag yet, so we use a fixed commit -git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +git_hash: 4c6219dc621d139cd39e8aaca578dd69b9c063d0 #git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' #tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21907: Fix runtime error on CentOS 6
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 4c6219dc621d139cd39e8aaca578dd69b9c063d0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 16:07:23 2017 +0200 Bug 21907: Fix runtime error on CentOS 6 In Mozilla bug 1324780, support for building with glib 2.28 (the version available in CentOS 6) was added. However we are building on Debian Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28 code paths. --- gfx/harfbuzz/src/hb-glib.cc | 41 ----------------------------------------- gfx/harfbuzz/src/hb-glib.h | 5 ----- 2 files changed, 46 deletions(-) diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc index 2b91b5b..0971ca2 100644 --- a/gfx/harfbuzz/src/hb-glib.cc +++ b/gfx/harfbuzz/src/hb-glib.cc @@ -33,7 +33,6 @@ #include "hb-unicode-private.hh" -#if !GLIB_CHECK_VERSION(2,29,14) static const hb_script_t glib_script_to_script[] = { @@ -155,14 +154,10 @@ glib_script_to_script[] = HB_SCRIPT_SORA_SOMPENG, HB_SCRIPT_TAKRI }; -#endif hb_script_t hb_glib_script_to_script (GUnicodeScript script) { -#if GLIB_CHECK_VERSION(2,29,14) - return (hb_script_t) g_unicode_script_to_iso15924 (script); -#else if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) return glib_script_to_script[script]; @@ -170,15 +165,11 @@ hb_glib_script_to_script (GUnicodeScript script) return HB_SCRIPT_INVALID; return HB_SCRIPT_UNKNOWN; -#endif } GUnicodeScript hb_glib_script_from_script (hb_script_t script) { -#if GLIB_CHECK_VERSION(2,29,14) - return g_unicode_script_from_iso15924 (script); -#else unsigned int count = ARRAY_LENGTH (glib_script_to_script); for (unsigned int i = 0; i < count; i++) if (glib_script_to_script[i] == script) @@ -188,7 +179,6 @@ hb_glib_script_from_script (hb_script_t script) return G_UNICODE_SCRIPT_INVALID_CODE; return G_UNICODE_SCRIPT_UNKNOWN; -#endif } @@ -243,10 +233,6 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *ab, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_compose (a, b, ab); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -280,10 +266,6 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *b, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_decompose (ab, a, b); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -339,10 +321,6 @@ hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *decomposed, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN); -#endif - /* If the user doesn't have GLib >= 2.29.12 we have to perform * a round trip to UTF-8 and the associated memory management dance. */ gchar utf8[6]; @@ -381,22 +359,3 @@ hb_glib_get_unicode_funcs (void) return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs); } - -#if GLIB_CHECK_VERSION(2,31,10) -/** - * hb_glib_blob_create: - * - * Since: 0.9.38 - **/ -hb_blob_t * -hb_glib_blob_create (GBytes *gbytes) -{ - gsize size = 0; - gconstpointer data = g_bytes_get_data (gbytes, &size); - return hb_blob_create ((const char *) data, - size, - HB_MEMORY_MODE_READONLY, - g_bytes_ref (gbytes), - (hb_destroy_func_t) g_bytes_unref); -} -#endif diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h index 5f04183..4adbd7c 100644 --- a/gfx/harfbuzz/src/hb-glib.h +++ b/gfx/harfbuzz/src/hb-glib.h @@ -46,11 +46,6 @@ hb_glib_script_from_script (hb_script_t script); HB_EXTERN hb_unicode_funcs_t * hb_glib_get_unicode_funcs (void); -#if GLIB_CHECK_VERSION(2,31,10) -HB_EXTERN hb_blob_t * -hb_glib_blob_create (GBytes *gbytes); -#endif - HB_END_DECLS #endif /* HB_GLIB_H */

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1352305 - Part2: Add a test case for making sure dialog windows will not be enforced to rounded sizes when fingerprinting resistance is enabled. r?ehsan
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit e761b3ca2087275c165fb67b7f876a55286d47dd Author: Tim Huang <tihuang(a)mozilla.com> Date: Fri Mar 31 00:11:41 2017 -0800 Bug 1352305 - Part2: Add a test case for making sure dialog windows will not be enforced to rounded sizes when fingerprinting resistance is enabled. r?ehsan A browser chrome test which ensures the dialog windows will not be enforced to be rounded sizes when fingerprinting resistance is enabled. MozReview-Commit-ID: LQG13FMANav --- .../resistfingerprinting/test/browser/browser.ini | 1 + .../browser/browser_roundedWindow_dialogWindow.js | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/browser/components/resistfingerprinting/test/browser/browser.ini b/browser/components/resistfingerprinting/test/browser/browser.ini index 713f3d2..4b81c91 100644 --- a/browser/components/resistfingerprinting/test/browser/browser.ini +++ b/browser/components/resistfingerprinting/test/browser/browser.ini @@ -4,6 +4,7 @@ support-files = file_dummy.html head.js +[browser_roundedWindow_dialogWindow.js] [browser_roundedWindow_newWindow.js] [browser_roundedWindow_open_max.js] [browser_roundedWindow_open_mid.js] diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js new file mode 100644 index 0000000..839388e --- /dev/null +++ b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js @@ -0,0 +1,30 @@ +/** + * Bug 1352305 - A test case for dialog windows that it should not be rounded + * even after fingerprinting resistance is enabled. + */ + +add_task(async function setup() { + await SpecialPowers.pushPrefEnv({"set": + [["privacy.resistFingerprinting", true]] + }); +}); + +add_task(async function test_dialog_window() { + + let diagWin; + + await new Promise(resolve => { + // Open a dialog window which is not rounded size. + diagWin = window.openDialog("about:blank", null, + "innerWidth=250,innerHeight=350"); + + diagWin.addEventListener("load", function() { + resolve(); + }, {once: true}); + }); + + is(diagWin.innerWidth, 250, "The dialog window doesn't have a rounded size."); + is(diagWin.innerHeight, 350, "The dialog window doesn't have a rounded size."); + + await BrowserTestUtils.closeWindow(diagWin); +});

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 9ee872b57e55ae672a30f087cf55bccef18f3646 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Apr 10 11:03:22 2017 -0700 Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is a window without a primary content when fingerprinting resistance is enabled. r?ehsan This patch making the nsXULWindow::ForceRoundedDimensions() will only be called when this window is a window which has a primary content when fingerprinting resistance is enabled. This will fix the problem that dialog windows are incorrectly resized after fingerprinting resistance is enabled. MozReview-Commit-ID: 6WD6c38CTPv --- xpfe/appshell/nsXULWindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp index a24318a..604c41a 100644 --- a/xpfe/appshell/nsXULWindow.cpp +++ b/xpfe/appshell/nsXULWindow.cpp @@ -1129,8 +1129,13 @@ void nsXULWindow::OnChromeLoaded() int32_t specWidth = -1, specHeight = -1; bool gotSize = false; + bool isContent = false; - if (nsContentUtils::ShouldResistFingerprinting()) { + GetHasPrimaryContent(&isContent); + + // If this window has a primary content and fingerprinting resistance is + // enabled, we enforce this window to rounded dimensions. + if (isContent && nsContentUtils::ShouldResistFingerprinting()) { ForceRoundedDimensions(); } else if (!mIgnoreXULSize) { gotSize = LoadSizeFromXUL(specWidth, specHeight);

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21876: Always use esr policies for e10s.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit 1240ac3e85536322d6af0075c662eaf60ab078f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 11 11:33:02 2017 -0400 Bug 21876: Always use esr policies for e10s. Always use the policies associated with the esr update channel so that the e10s behavior is the same for all Tor Browser builds. --- browser/extensions/e10srollout/bootstrap.js | 5 ++++- toolkit/xre/nsAppRunner.cpp | 9 +++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/extensions/e10srollout/bootstrap.js b/browser/extensions/e10srollout/bootstrap.js index 8847501..e4e0738 100644 --- a/browser/extensions/e10srollout/bootstrap.js +++ b/browser/extensions/e10srollout/bootstrap.js @@ -58,7 +58,10 @@ function defineCohort() { } cohortDefinedOnThisSession = true; - let updateChannel = UpdateUtils.getUpdateChannel(false); + // For Tor Browser, always use the e10s policies associated with the esr + // update channel so that the e10s behavior is the same for all builds. + let updateChannel = "esr"; + if (!(updateChannel in TEST_THRESHOLD)) { setCohort("unsupportedChannel"); return; diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 721f599..190fec1 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5453,15 +5453,12 @@ MultiprocessBlockPolicy() { #endif /** - * Avoids enabling e10s for Windows XP users on the release channel. + * Avoid enabling e10s for all Windows XP users. */ #if defined(XP_WIN) if (!IsVistaOrLater()) { - nsAdoptingCString channelName = Preferences::GetDefaultCString("app.update.channel"); - if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) { - gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; - return gMultiprocessBlockPolicy; - } + gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; + return gMultiprocessBlockPolicy; } #endif // XP_WIN

1 0

[tor-browser-bundle/master] We are on tor-browser-builder-4 meanwhile
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit beb571f4c3e96be1458c870e6be486e5f1561d39 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 11 14:54:38 2017 +0000 We are on tor-browser-builder-4 meanwhile --- gitian/check-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index d6e79fd..74ddab6 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -92,7 +92,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder-3 https://git.torproject.org/builders/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-4 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi

1 0

[tor-browser-build/master] Bug 21837: Fix reproducibility of accessibility code for Windows
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit bf7083a47fbe40f8e5ca423fde06bb0f0cd403b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:18:50 2017 +0200 Bug 21837: Fix reproducibility of accessibility code for Windows tor-browser-bundle.git commit: f13a2dae1ca038a448483dc6b25f17e40c8f3c9b --- projects/firefox/build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index b10bab4..3985aec 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -66,6 +66,9 @@ fi # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + + # Make sure widl is not inserting random timestamps, see #21837. + export WIDL_TIME_OVERRIDE="0" [% END %] [% IF c("var/osname") == "linux-i686" -%]

1 0

[tor-browser-build/master] Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80.
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit d7320b6a957ef07eb5d6b86412d2e0e0aaf6e9e4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 19 15:39:21 2017 -0700 Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80. The second one uses some inline comment blocks to break up the format, as a test to see if censors' parsers can handle it. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 61e2a9e..bcf3a19 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); 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.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); 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 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Update Tor Browser version number
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 266cd147cd2364b2bd7ee493e5552272f9c6613a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:21:27 2017 +0200 Update Tor Browser version number --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 355c593..651acfa 100644 --- a/rbm.conf +++ b/rbm.conf @@ -7,7 +7,7 @@ build_log: 'logs/[% project %]-[% c("var/osname") %].log' pkg_type: build var: - torbrowser_version: '6.5n' + torbrowser_version: '7.0a3' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Add some indentation in various places
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 1c9ccca6e097a988283d9474d30118670cbbded8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:17:06 2017 +0200 Add some indentation in various places Add some indentation to make things more clear. --- projects/binutils/build | 26 ++++---- projects/firefox-langpacks/build | 14 ++--- projects/firefox/build | 124 +++++++++++++++++++-------------------- projects/fonts/build | 8 +-- projects/tor/build | 90 ++++++++++++++-------------- 5 files changed, 131 insertions(+), 131 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index e3064cf..8d4f09f 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -18,25 +18,25 @@ distdir=/var/tmp/dist/binutils tar xf [% project %]-[% c("version") %].tar.bz2 cd [% project %]-[% c("version") %] [% IF c('var/windows') -%] -# XXX: This is needed due to bug 10102. -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 + # XXX: This is needed due to bug 10102. + 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') %] make -j4 make install [% IF c("var/linux") %] -# Make sure gold is used with the hardening wrapper for full RELRO, see #13031. -cd $distdir/bin -rm ld -cp /usr/bin/hardened-ld ./ -mv ld.gold ld.gold.real -ln -sf hardened-ld ld.gold -ln -sf ld.gold ld + # Make sure gold is used with the hardening wrapper for full RELRO, see #13031. + cd $distdir/bin + rm ld + cp /usr/bin/hardened-ld ./ + mv ld.gold ld.gold.real + ln -sf hardened-ld ld.gold + ln -sf ld.gold ld [% END %] cd /var/tmp/dist diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 9ac07cb..6bc1810 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -2,15 +2,15 @@ [% c("var/set_default_env") -%] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') -echo "$shasum [% filename %]" | sha512sum -c + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') + echo "$shasum [% filename %]" | sha512sum -c [% END %] mkdir -p [% dest_dir %]/[% c("filename") %] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ [% END %] diff --git a/projects/firefox/build b/projects/firefox/build index 4d83b28..b10bab4 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -21,21 +21,21 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") %] -mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] -mkdir -p $distdir/TorBrowser.app/Contents/MacOS + mkdir -p $distdir/TorBrowser.app/Contents/MacOS [% ELSE %] -mkdir -p $distdir/Browser + mkdir -p $distdir/Browser [% END %] [% IF c("var/linux") %] -mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 + mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -49,29 +49,29 @@ then fi [% IF c("var/windows") %] -# FIXME -# Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get -# all Firefox libraries linked against msvcr100. Alas, this does not hold for -# NSPR. Without patching it we get a "missing entry points for _strcmpi in -# msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there -# contains a proper patch according to the mingw-w64 developers. -# However, even with this patch the _strcmpi issue is still popping up, -# probably due to a bug in our current linking setup. The small patch below -# is therefore just a workaround which should get fixed but is at least -# justified as the signature of _strcmpi and _stricmp is the same, see: -# http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. -sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c -export HOST_LDFLAGS=" " -export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" -# Our flags don't get passed to NSS. We need to do that manually using an -# obscure one. -export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # FIXME + # Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get + # all Firefox libraries linked against msvcr100. Alas, this does not hold for + # NSPR. Without patching it we get a "missing entry points for _strcmpi in + # msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there + # contains a proper patch according to the mingw-w64 developers. + # However, even with this patch the _strcmpi issue is still popping up, + # probably due to a bug in our current linking setup. The small patch below + # is therefore just a workaround which should get fixed but is at least + # justified as the signature of _strcmpi and _stricmp is the same, see: + # http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. + sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c + export HOST_LDFLAGS=" " + export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # Our flags don't get passed to NSS. We need to do that manually using an + # obscure one. + export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" [% END %] [% IF c("var/osname") == "linux-i686" -%] -export LDFLAGS=-m32 -export CFLAGS=-m32 -export CC='gcc -m32' + export LDFLAGS=-m32 + export CFLAGS=-m32 + export CC='gcc -m32' [% END -%] rm -f configure @@ -82,31 +82,31 @@ make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true [% IF c("var/osx") %] -cp -a obj-macos/dist/firefox/* $distdir -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin - -# Adjust the Info.plist file -INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist -mv $INFO_PLIST tmp.plist -python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST -rm -f tmp.plist + cp -a obj-macos/dist/firefox/* $distdir + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin + + # Adjust the Info.plist file + INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist + mv $INFO_PLIST tmp.plist + python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST + rm -f tmp.plist [% END %] [% IF c("var/linux") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/Browser/firefox-bin -# TODO: There goes FIPS-140.. We could upload these somewhere unique and -# subsequent builds could test to see if they've been uploaded before... -# But let's find out if it actually matters first.. -rm -f $distdir/Browser/*.chk + cp -a obj-*/dist/firefox/* $distdir/Browser/ + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/Browser/firefox-bin + # TODO: There goes FIPS-140.. We could upload these somewhere unique and + # subsequent builds could test to see if they've been uploaded before... + # But let's find out if it actually matters first.. + rm -f $distdir/Browser/*.chk [% END %] [% IF c("var/windows") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -cp -a $rootdir/msvcr100.dll $distdir/Browser -cp -a $gcclibs/libssp-0.dll $distdir/Browser + cp -a obj-*/dist/firefox/* $distdir/Browser/ + cp -a $rootdir/msvcr100.dll $distdir/Browser + cp -a $gcclibs/libssp-0.dll $distdir/Browser [% END %] # Make MAR-based update tools available for use during the bundle phase. @@ -121,26 +121,26 @@ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] -cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ -cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ -NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" -NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" -for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ -done + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done [% END %] cd $distdir [% IF c("var/linux") %] -# Strip and generate debuginfo for the firefox binary that we keep, all *.so -# files, the plugin-container, and the updater (see ticket #10126) -for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater -do - objcopy --only-keep-debug $LIB Debug/$LIB - strip $LIB - objcopy --add-gnu-debuglink=./Debug/$LIB $LIB -done + # Strip and generate debuginfo for the firefox binary that we keep, all *.so + # files, the plugin-container, and the updater (see ticket #10126) + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater + do + objcopy --only-keep-debug $LIB Debug/$LIB + strip $LIB + objcopy --add-gnu-debuglink=./Debug/$LIB $LIB + done [% END %] # Re-zipping the omni.ja files is not needed to make them reproductible, @@ -156,8 +156,8 @@ done [% END %] [% IF c("var/windows") %] -cp $rootdir/msvcr100.dll Browser/ -cp $gcclibs/libssp-0.dll Browser/ + cp $rootdir/msvcr100.dll Browser/ + cp $gcclibs/libssp-0.dll Browser/ [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/fonts/build b/projects/fonts/build index e645c31..9b33da9 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -13,12 +13,12 @@ mkdir -p $distdir END; %] [% IF c("var/linux") || c("var/osx") %] -unzip -o STIXv1.1.1-latex.zip -d STIX -cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ + unzip -o STIXv1.1.1-latex.zip -d STIX + cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ [% END %] [% IF c("var/linux") %] -cp NotoEmoji-Regular.ttf $distdir/ -cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ + cp NotoEmoji-Regular.ttf $distdir/ + cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ [% END %] cd /var/tmp/dist [% c('tar', { diff --git a/projects/tor/build b/projects/tor/build index c1296fe..85e158f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -5,17 +5,17 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") || c("var/windows") %] -TORCONFIGDIR="$distdir/Data/Tor" -mkdir -p $TORCONFIGDIR -mkdir -p "$distdir/Tor" + TORCONFIGDIR="$distdir/Data/Tor" + mkdir -p $TORCONFIGDIR + mkdir -p "$distdir/Tor" [% END %] [% IF c("var/osx") %] -TORBINDIR="$distdir/Contents/MacOS/Tor" -TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" -mkdir -p $distdir/bin -mkdir -p $TORBINDIR -mkdir -p $TORCONFIGDIR + TORBINDIR="$distdir/Contents/MacOS/Tor" + TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" + mkdir -p $distdir/bin + mkdir -p $TORBINDIR + mkdir -p $TORCONFIGDIR [% END %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] @@ -25,32 +25,32 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] -tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] -zlibdir=/var/tmp/build/zlib -cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ - $gcclibs/*.dll $distdir/Tor/ + tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] + zlibdir=/var/tmp/build/zlib + cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ + $gcclibs/*.dll $distdir/Tor/ [% END %] [% IF c("var/linux") %] -mkdir -p "$distdir/Debug/Tor" -cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" -cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" -cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" -# We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. -# Copying it into /Browser, which feels more natural, and amending -# LD_LIBRARY_PATH breaks updates from a Tor Browser with the old -# LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy -# the libstdc++ into the directory with the libs tor depends on, too. See bug -# 13359 for further details. -cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" -chmod 700 "$distdir"/Tor/*.so* -# This is needed to make RPATH unavailable. See bug 9150. -export LD_LIBRARY_PATH="$distdir/Tor/" + mkdir -p "$distdir/Debug/Tor" + cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" + cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" + # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. + # Copying it into /Browser, which feels more natural, and amending + # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old + # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy + # the libstdc++ into the directory with the libs tor depends on, too. See bug + # 13359 for further details. + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + chmod 700 "$distdir"/Tor/*.so* + # This is needed to make RPATH unavailable. See bug 9150. + export LD_LIBRARY_PATH="$distdir/Tor/" [% END %] [% IF c("var/osx") %] -cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ + cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] @@ -73,33 +73,33 @@ cp $distdir/share/tor/geoip $TORCONFIGDIR cp $distdir/share/tor/geoip6 $TORCONFIGDIR [% IF c("var/osx") %] -LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` -cd $distdir -cp bin/tor $TORBINDIR/ -cd $TORBINDIR/ -x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` + cd $distdir + cp bin/tor $TORBINDIR/ + cd $TORBINDIR/ + x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor [% END %] cd $distdir [% IF c("var/windows") %] -install -s $distdir/bin/tor.exe $distdir/Tor/ + install -s $distdir/bin/tor.exe $distdir/Tor/ [% IF c("var/expert_bundle") %] -install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ + install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ [% END %] [% END %] [% IF c("var/linux") %] -# Strip and generate debuginfo for libs -objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor -install -s $distdir/bin/tor $distdir/Tor/ -objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor -for i in $distdir/Tor/*so* -do - LIB=`basename $i` - objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB - strip $distdir/Tor/$LIB - objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB -done + # Strip and generate debuginfo for libs + objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor + install -s $distdir/bin/tor $distdir/Tor/ + objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor + for i in $distdir/Tor/*so* + do + LIB=`basename $i` + objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB + strip $distdir/Tor/$LIB + objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB + done [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %]

1 0