- tbb-commits - lists.torproject.org

[torbutton/master] Bug 31562: Fix circuit display for error pages
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit bb975009a65ab9039641d03b11023fe6c52f5b7a Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 5 17:56:08 2019 +0200 Bug 31562: Fix circuit display for error pages --- chrome/content/torbutton.js | 2 +- modules/utils.js | 49 +++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 9d6a5c48..94206ea5 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -850,7 +850,7 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let firstPartyDomain = getDomainForBrowser(gBrowser); + let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/modules/utils.js b/modules/utils.js index ea41fce9..0caf475f 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -4,9 +4,6 @@ // ### Import Mozilla Services const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -// ### About firstPartyDomain literal -const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla"; - // ## Pref utils // __prefs__. A shortcut to Mozilla Services.prefs. @@ -212,30 +209,34 @@ var show_torbrowser_manual = () => { return availableLocales.indexOf(shortLocale) >= 0; } +var getFPDFromHost = (hostname) => { + try { + return Services.eTLD.getBaseDomainFromHost(hostname); + } catch (e) { + if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || + e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { + return hostname; + } + } + return null; +} + +// Assuming this is called with gBrowser.selectedBrowser var getDomainForBrowser = (browser) => { - let firstPartyDomain = browser.contentPrincipal.originAttributes.firstPartyDomain; - // Bug 22538: For neterror or certerror, get firstPartyDomain causing it from the u param - if (firstPartyDomain === k_tb_about_uri_first_party_domain) { - let knownErrors = ["about:neterror", "about:certerror"]; - let origin = browser.contentPrincipal.origin || ''; - if (knownErrors.some(x => origin.startsWith(x))) { - try { - let urlOrigin = new URL(origin); - let { hostname } = new URL(urlOrigin.searchParams.get('u')); - if (hostname) { - try { - firstPartyDomain = Services.eTLD.getBaseDomainFromHost(hostname); - } catch (e) { - if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || - e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { - firstPartyDomain = hostname; - } - } - } - } catch (e) {} + let fpd = browser.contentPrincipal.originAttributes.firstPartyDomain; + // Bug 31562: For neterror or certerror, get the original URL from + // browser.currentURI and use it to calculate the firstPartyDomain. + let knownErrors = ["about:neterror", "about:certerror"]; + let documentURI = browser.documentURI; + if (documentURI && documentURI.schemeIs('about') && + knownErrors.some(x => documentURI.spec.startsWith(x))) { + let knownSchemes = ["http", "https", "ftp"]; + let currentURI = browser.currentURI; + if (currentURI && knownSchemes.some(x => currentURI.schemeIs(x))) { + fpd = getFPDFromHost(currentURI.host) || fpd; } } - return firstPartyDomain; + return fpd; }; // Export utility functions for external use.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31457: disable per-installation profiles
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 31d00e2f9c23184c2378d125c11a4e1219a8b59e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 4 08:23:19 2019 -0400 Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. --- browser/moz.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/moz.configure b/browser/moz.configure index 3057a5040c5f..43bc0c1fe59b 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -7,7 +7,7 @@ imply_option('MOZ_PLACES', True) imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_SERVICES_SYNC', True) -imply_option('MOZ_DEDICATED_PROFILES', True) +imply_option('MOZ_DEDICATED_PROFILES', False) imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) with only_when(target_is_linux & compile_environment):

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up Torbutton changes for onboarding
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 936ea93a3e8dc9846c2e738096a3ad8a0fe90325 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 6 10:02:40 2019 +0000 Pick up Torbutton changes for onboarding --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 1edfec57049a..d796dd27d128 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 1edfec57049a76052fda8eb17b6e3b8f281e3361 +Subproject commit d796dd27d12850bd176a85e160002755bfccfab2

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 28822: Convert onboarding to webextension
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit b4e8db514df16856b567be1e13cb9af11a7de6e5 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:06:24 2019 +0200 fixup! Bug 28822: Convert onboarding to webextension --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- extensions/permissions/nsPermissionManager.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 33777dd27d6e..059701f78960 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -8,7 +8,7 @@ var EXPORTED_SYMBOLS = ["Onboarding"]; -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css"; const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties"; diff --git a/extensions/permissions/nsPermissionManager.cpp b/extensions/permissions/nsPermissionManager.cpp index 1a652bef4222..2e23d48623e8 100644 --- a/extensions/permissions/nsPermissionManager.cpp +++ b/extensions/permissions/nsPermissionManager.cpp @@ -125,6 +125,9 @@ static const nsLiteralCString kPreloadPermissions[] = { NS_LITERAL_CSTRING("cookie"), NS_LITERAL_CSTRING("trackingprotection"), NS_LITERAL_CSTRING("trackingprotection-pb"), + // Bug 28822: Make sure uitour permissions are preloaded in content processes. + NS_LITERAL_CSTRING("uitour"), + USER_INTERACTION_PERM}; // NOTE: nullptr can be passed as aType - if it is this function will return

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 535d41fd820d5b94caf43f3e403dc74b3566c837 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 11:45:55 2019 +0200 fixup! Bug 29768: Introduce new features to users Fixes bug 30560 --- .../content/img/figure_tor-security-level.png | Bin 10888 -> 11263 bytes .../content/img/figure_tor-toolbar-layout.png | Bin 5837 -> 10569 bytes .../extensions/onboarding/content/onboarding.css | 8 ++------ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/browser/extensions/onboarding/content/img/figure_tor-security-level.png b/browser/extensions/onboarding/content/img/figure_tor-security-level.png index 4f940ea008ef..9a5c221c8d8e 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-security-level.png and b/browser/extensions/onboarding/content/img/figure_tor-security-level.png differ diff --git a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png index 0a8161087827..624ef6514d39 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png and b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png differ diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 7373e0da53fc..f71ec1d13789 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -27,7 +27,7 @@ padding: 16px 0 0 0; position: fixed; top: 4px; - offset-inline-start: 12px; + inset-inline-start: 12px; } /* @@ -41,7 +41,7 @@ width: 20px; height: 20px; top: -8px; - offset-inline-start: -16px; + inset-inline-start: -16px; background-color: #00E2B1; border-radius: 50%; animation: pulsate 2.0s ease-out; @@ -61,11 +61,7 @@ } #onboarding-overlay-button { - padding: 10px 0 0 0; - position: fixed; cursor: pointer; - top: 4px; - inset-inline-start: 12px; border: none; /* Set to none so no grey contrast background in the high-contrast mode */ background: none;

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26962 - implement new features onboarding (part 1).
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 915d521a2fae009509a229bdaeb1d3a95a17b8c1 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:12:18 2019 +0200 fixup! Bug 26962 - implement new features onboarding (part 1). --- browser/app/permissions | 2 -- browser/themes/shared/UITour.inc.css | 1 - 2 files changed, 3 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index c9feba65b69f..fa17e78db211 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -9,8 +9,6 @@ # UITour # DuckDuckGo .onion (used for circuit display onboarding). origin uitour 1 https://3g2upl4pq6kufc4m.onion -origin uitour 1 about:home -origin uitour 1 about:newtab origin uitour 1 about:tor # Remote troubleshooting diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css index bfc782c68c5f..235e4d898e78 100644 --- a/browser/themes/shared/UITour.inc.css +++ b/browser/themes/shared/UITour.inc.css @@ -132,7 +132,6 @@ padding-right: 10px; } -/* The primary button gets the same color as the customize button. */ #UITourTooltipButtons > button.button-primary { background-color: #420C5D; color: white;

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs"
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 5d0ffb6cea1e3eca56884f087120f2b40aa2926b Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:48:36 2019 +0200 Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. --- browser/components/BrowserGlue.jsm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 7503ca7037e6..a99a29a014ad 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -3086,17 +3086,6 @@ BrowserGlue.prototype = { ); } - if (currentUIVersion < 76) { - // Clear old onboarding prefs from profile (bug 1462415) - let onboardingPrefs = Services.prefs.getBranch("browser.onboarding."); - if (onboardingPrefs) { - let onboardingPrefsArray = onboardingPrefs.getChildList(""); - for (let item of onboardingPrefsArray) { - Services.prefs.clearUserPref("browser.onboarding." + item); - } - } - } - if (currentUIVersion < 77) { // Remove currentset from all the toolbars let toolbars = [

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit e1ad91f3031dd08a0591d0f9d472cb49e015ad75 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:20:00 2019 +0200 fixup! Bug 26961: New user onboarding. --- browser/components/uitour/UITour.jsm | 2 +- browser/extensions/onboarding/api.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index 6eba73a8f51a..2a4c81d69374 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -789,7 +789,7 @@ var UITour = { let securityLevelButton = window.document.getElementById("security-level-button"); if (securityLevelButton) - securityLevelButton.doCommand(); + securityLevelButton.click(); break; } diff --git a/browser/extensions/onboarding/api.js b/browser/extensions/onboarding/api.js index db10a6d16248..d11e525b9f8c 100644 --- a/browser/extensions/onboarding/api.js +++ b/browser/extensions/onboarding/api.js @@ -8,7 +8,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { OnboardingTourType: "resource://onboarding/modules/OnboardingTourType.jsm", - OnboardingTelemetry: "resource://onboarding/modules/OnboardingTelemetry.jsm", Services: "resource://gre/modules/Services.jsm", UIState: "resource://services-sync/UIState.jsm", });

1 0

[torbutton/master] Bug 28822: Change about:tor CSP so that UITour-lib.js can be loaded
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit d796dd27d12850bd176a85e160002755bfccfab2 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 13:09:35 2019 +0200 Bug 28822: Change about:tor CSP so that UITour-lib.js can be loaded --- chrome/content/aboutTor/aboutTor.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 80716e5f..b146fb1b 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -20,7 +20,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: 'unsafe-inline';" /> + <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: resource: 'unsafe-inline';" /> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all"

1 0

[tor-browser-build/master] Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 34626bda99acdcc94d45e7095313d6d3882cdd32 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 30 18:45:23 2019 +0200 Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser --- projects/cbindgen/build | 9 ++------- projects/debootstrap-image/config | 7 ------- projects/firefox/build | 5 +---- projects/firefox/config | 6 +++++- projects/firefox/mozconfig-windows-i686 | 3 --- projects/gcc/build | 1 - projects/gcc/config | 1 - projects/go/build | 1 - projects/go/config | 1 - projects/mingw-w64-clang/build | 4 +--- projects/mingw-w64/config | 1 - projects/rust/build | 3 +-- projects/rust/config | 5 +---- projects/webrtc/build | 1 - rbm.conf | 14 ++------------ 15 files changed, 13 insertions(+), 49 deletions(-) diff --git a/projects/cbindgen/build b/projects/cbindgen/build index 402a216..429f567 100644 --- a/projects/cbindgen/build +++ b/projects/cbindgen/build @@ -22,13 +22,8 @@ replace-with = "vendored-sources" directory = "/var/tmp/build/cbindgen/vendor" EOF -[% IF ! c("var/windows-i686") -%] - target=x86_64 -[% ELSE -%] - target=i686 -[% END -%] -cargo build --release --frozen --target $target-unknown-linux-gnu -mv target/$target-unknown-linux-gnu/release/cbindgen $distdir/[% project %] +cargo build --release --frozen --target x86_64-unknown-linux-gnu +mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %] cd $distdir [% c('tar', { diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index cad9c77..a50cbf1 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -65,13 +65,6 @@ targets: suite: stretch arch: amd64 - stretch-i386: - var: - minimal_apt_version: 1.4.9 - container: - suite: stretch - arch: i386 - input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' diff --git a/projects/firefox/build b/projects/firefox/build index 1450576..87f8532 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,5 +1,4 @@ #!/bin/bash -[% c("var/setarch") -%] [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] @@ -11,9 +10,7 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/fxc2') %] export PATH="/var/tmp/dist/fxc2/bin:$PATH" # fxc2 requires Wine. - [% IF c("var/windows-x86_64") %] - export WINEARCH=win64 - [% END %] + export WINEARCH=[% IF c("var/windows-x86_64") %]win64[% ELSE %]win32[% END %] export HOME=/var/tmp/home mkdir -p $HOME WINEROOT=$HOME/.wine/drive_c diff --git a/projects/firefox/config b/projects/firefox/config index b13635c..334a1a8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -111,11 +111,15 @@ targets: arch_deps: - wine pre_pkginst: | + [% IF c("var/windows-i686") -%] + # We need this to install wine32 + dpkg --add-architecture i386 + [% END -%] echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list post_pkginst: | # We need to have at least 3.0.3 which Mozilla is using in the # mingw-w64/clang build process - apt-get -y -t stretch-backports install wine + apt-get -y -t stretch-backports install wine[% IF c("var/windows-i686") %]32[% END %] compiler: mingw-w64-clang windows-i686: diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 5538bc1..eaa704f 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -24,9 +24,6 @@ export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug -# Until we build on a 64bit host we need to hack around linker errors due to -# memory constraints -ac_add_options --disable-debug-symbols ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --enable-official-branding diff --git a/projects/gcc/build b/projects/gcc/build index 1d055b4..bd7e837 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,6 +1,5 @@ #!/bin/sh [% c("var/set_default_env") -%] -[% c("var/setarch") -%] [% IF c("var/linux") -%] # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 diff --git a/projects/gcc/config b/projects/gcc/config index 9fef3c4..d776a2c 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -8,7 +8,6 @@ var: - build-essential - libmpc-dev setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" diff --git a/projects/go/build b/projects/go/build index b9057a5..4945c88 100644 --- a/projects/go/build +++ b/projects/go/build @@ -1,6 +1,5 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist diff --git a/projects/go/config b/projects/go/config index fd96bb6..ffe07ea 100644 --- a/projects/go/config +++ b/projects/go/config @@ -8,7 +8,6 @@ var: use_container: 1 setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] export GOOS=[% c("var/GOOS") %] diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 820346d..b63a87f 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -24,9 +24,7 @@ tar -xf $rootdir/[% c('input_files_by_name/llvm-mingw') %] # Adding the wrappers and symlinks we need cd $distdir/bin exception_flags="" -target="" [% IF c("var/windows-i686") %] - target="--target=i686-linux-gnu" exception_flags="-fsjlj-exceptions" [% END -%] compiler_flags="--sysroot \$DIR/../[% c("arch") %]-w64-mingw32 -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld $exception_flags -fuse-cxa-atexit -Qunused-arguments" @@ -49,7 +47,7 @@ ln -s llvm-nm [% c("arch") %]-w64-mingw32-nm ln -s llvm-strip [% c("arch") %]-w64-mingw32-strip ln -s llvm-readobj [% c("arch") %]-w64-mingw32-readobj ln -s llvm-objcopy [% c("arch") %]-w64-mingw32-objcopy -./clang $builddir/llvm-mingw/wrappers/windres-wrapper.c $target -O2 -Wl,-s -o [% c("arch") %]-w64-mingw32-windres +./clang $builddir/llvm-mingw/wrappers/windres-wrapper.c -O2 -Wl,-s -o [% c("arch") %]-w64-mingw32-windres # Building mingw-w64 export PATH="$distdir/bin:/var/tmp/dist/cmake/bin:$PATH" diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3bb1dda..658c83d 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -12,7 +12,6 @@ var: - build-essential - libmpc-dev setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/mingw-w64/bin:$PATH" diff --git a/projects/rust/build b/projects/rust/build index ce039ea..9a6b54a 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -1,12 +1,11 @@ #!/bin/bash -[% c('var/setarch') %] [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] -cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('var/rust_arch') %]-unknown-linux-gnu +cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" diff --git a/projects/rust/config b/projects/rust/config index 106c709..dbde815 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -4,14 +4,12 @@ version: 1.34.2 var: prev_version: 1.33.0 - rust_arch: '[% c("arch") %]' container: use_container: 1 targets: android: var: - rust_arch: x86_64 arch_deps: - libssl-dev - pkg-config @@ -30,7 +28,6 @@ targets: linux: var: - rust_arch: x86_64 deps: - libc6-dev-i386 - lib32stdc++6 @@ -98,7 +95,7 @@ input_files: sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg - - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-[% c("var/rust_arch") %]-unknown-linux-gnu.tar.xz' + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' name: prev_rust sig_ext: asc file_gpg_id: 1 diff --git a/projects/webrtc/build b/projects/webrtc/build index 77d4026..2ede64b 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -1,7 +1,6 @@ #!/bin/bash set -e [% c("var/set_default_env") -%] -[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/rbm.conf b/rbm.conf index 967eb08..581bd0e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -280,9 +280,6 @@ targets: var: windows-x86_64: 1 osname: windows-x86_64 - container: - arch: amd64 - faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # HEASLR is 64 bit only (see bug 12968) flag_HEASLR: '-Wl,--high-entropy-va' windows-i686: @@ -290,25 +287,18 @@ targets: var: windows-i686: 1 osname: windows-i686 - container: - arch: i386 - faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1 - setarch: | - if test -z "$RBM_SETARCH" - then - export RBM_SETARCH=1 - exec setarch i686 ./build - fi windows: var: windows: 1 container: suite: stretch + arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 deps: - build-essential - python

1 0