January 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit fe7d1b4ba0bc683c6b23d162c1ea7d7efa2b13d8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 9 12:39:18 2018 +0100 Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds --- projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index ac51782..14ba58e 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -44,6 +44,10 @@ openssldir=/var/tmp/dist/openssl # 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/" + [% IF c("var/asan") -%] + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.2 "$distdir/Tor/" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.0 "$distdir/Tor/" + [% END -%] chmod 700 "$distdir"/Tor/*.so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$distdir/Tor/"

1 0

[tor-browser-build/master] Bug 23892: Include Firefox and Tor debug files in final build directory
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit ea4d78280772479da994c3222e76eabe47b26257 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 22 14:24:35 2017 +0100 Bug 23892: Include Firefox and Tor debug files in final build directory --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f8f1356..e87ef11 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -288,6 +288,10 @@ cd $distdir rm -rf $distdir/${PKG_DIR} cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ +[% IF c("var/linux") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.gz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.gz + cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.gz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.gz +[% END -%] # If we did not create a multi-lingual package above, create a package for # each locale.

1 0

[tor-browser-build/master] Bug 23911: Create .htaccess file in build directory
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit a7dd0dd538533f35edf2dcd18d99b59447a2517b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 22 13:50:37 2017 +0100 Bug 23911: Create .htaccess file in build directory --- projects/release/build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/release/build b/projects/release/build index 2be0c49..985ffa3 100644 --- a/projects/release/build +++ b/projects/release/build @@ -23,6 +23,13 @@ mkdir -p "$destdir" mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" +cat > .htaccess <<EOF +RewriteEngine On +RewriteRule ^sha256sums.txt$ sha256sums-unsigned-build.txt +RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc +RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt +RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc +EOF sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt

1 0

[torbutton/master] Bug 24702: Remove Mozilla text from banner
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit f3dd9d4caf350bf87550fdec45061f9691f86b48 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Dec 21 14:45:53 2017 -0800 Bug 24702: Remove Mozilla text from banner --- src/chrome/content/aboutTor/aboutTor.xhtml | 1 - src/chrome/content/aboutTor/donation_banner.js | 2 -- src/chrome/skin/donation_banner.css | 17 ----------------- 3 files changed, 20 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 248df11..0fca4b9 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,7 +37,6 @@ window.addEventListener("pageshow", function() { <div id="banner-contents-container"> <div id="banner-tagline"><span></span></div> <div id="banner-slogan"><span></span></div> - <div id="banner-mozilla"><span></span></div> <a id="banner-donate-button-link" href="https://www.torproject.org/donate/donate-pdr-tbb"> <div id="banner-donate-button"> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 391c28f..85f6af1 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -46,7 +46,6 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-slogan")); - fitTextInElement(sel("#banner-mozilla")); fitTextInElement(sel("#banner-donate-button-inner")); avoidWidows(sel("#banner-tagline span")); }; @@ -59,7 +58,6 @@ let runDonationBanner = function ({ taglines, slogan, mozilla, donate, shortLoca try { sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; sel("#banner-slogan span").innerText = slogan; - sel("#banner-mozilla span").innerText = mozilla; let donateButtonText = sel("#banner-donate-button-inner span"); let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index c91f0e5..dd9d7be 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -75,23 +75,6 @@ left: 285px; right: 85px; } -#banner-mozilla { - align-items: center; - bottom: 5px; - color: white; - display: flex; - font-family: sans-serif; - left: 85px; - position: absolute; - right: 285px; - text-align: start; - top: 120px; - white-space: nowrap; -} -#banner-mozilla:-moz-dir(rtl) { - left: 285px; - right: 85px; -} #banner-donate-button { background-color: #13a513; border: 0px;

1 0