- tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.0] Release preparations for 8.0.9
by gk＠torproject.org 05 May '19

05 May '19

commit d48ca8aa4c5c5ad4a1285dfa102eab080776427c Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 5 06:26:01 2019 +0000 Release preparations for 8.0.9 Picking up hotfix for 30388 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 5 ++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index dcc20c4..2d0712e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0fed743..197b951 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 8.0.9 -- May 6 2019 +* All platforms + * Backport fixes for bug 1549010 and bug 1549061 + * Bug 30388: NoScript and all user-installed add-ons got deactivated + * Update NoScript to 10.6.1 + * Bug 29872: XSS popup with DuckDuckGo search on about:tor + Tor Browser 8.0.8 -- March 22 2019 * All platforms * Update Firefox to 60.6.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6aa3c66..94957d3 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,9 +74,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: b486b8c224882652b00b81a3e4a52389ed8b55035f8f09fec930a36b7477ac2e + sha256sum: b15047d0045d12f28b2e1e444bdb86800257b5ca6cc8f4c8022b20c550cd9727 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index f63c3a1..f46ece9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.8' + torbrowser_version: '8.0.9' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.6 - - 8.0.7 + - 8.0.8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.6.1esr-8.0-1] Bug 1549061 - Add intermediate certificate [ESR60] r=kmag a=tomprince CLOSED TREE
by gk＠torproject.org 05 May '19

05 May '19

commit 428fad69b4b0baa331d0e8be8c4012145ecae726 Author: Mark Goodwin <mgoodwin(a)mozilla.com> Date: Sat May 4 16:58:30 2019 +0000 Bug 1549061 - Add intermediate certificate [ESR60] r=kmag a=tomprince CLOSED TREE This patch relies on a schema bump in a previous commit Differential Revision: https://phabricator.services.mozilla.com/D29947 --HG-- extra : source : bfd165fd51ec90777db01c21e3b727328a5ea1a3 --- .../mozapps/extensions/internal/XPIProvider.jsm | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index d48e857159a5..10b21d5cb5fd 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1803,6 +1803,29 @@ var XPIStates = { }, }; +// https://bugzilla.mozilla.org/show_bug.cgi?id=1548973 +const MISSING_INTERMEDIATE_CERTIFICATE = "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"; + +function addMissingIntermediateCertificate() { + const PREF_SIGNER_HOTFIXED = "extensions.signer.hotfixed"; + let hotfixApplied = Services.prefs.getBoolPref(PREF_SIGNER_HOTFIXED, false); + if (hotfixApplied) { + return; + } + logger.debug("hotfix for addon signing cert has not been applied; applying"); + + try { + let certDB = Cc["@mozilla.org/security/x509certdb;1"].getService(Ci.nsIX509CertDB); + certDB.addCertFromBase64(MISSING_INTERMEDIATE_CERTIFICATE, ",,"); + logger.debug("new intermediate certificate added"); + } catch (e) { + logger.error("failed to add new intermediate certificate:", e); + return; + } + + Services.prefs.setBoolPref(PREF_SIGNER_HOTFIXED, true); +} + var XPIProvider = { get name() { return "XPIProvider"; @@ -2111,6 +2134,11 @@ var XPIProvider = { XPIProvider.installLocationsByName[location.name] = location; } + // Add missing certificate (bug 1548973). Mistakenly disabled add-ons are + // going to be re-enabled because the schema version bump forces a new + // signature verification check. + addMissingIntermediateCertificate(); + try { AddonManagerPrivate.recordTimestamp("XPI_startup_begin");

1 0

[tor-browser/tor-browser-60.6.1esr-8.0-1] Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed
by gk＠torproject.org 05 May '19

05 May '19

commit edf18e747ca8949a877f9c41575ce679ce99eb77 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 5 06:10:28 2019 +0000 Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed For Tor Browser added a fix to temporarily disable `security.nocertdb` so the new cert can be inserted, and revert to original once the cert is inserted. Patch by pospeselr. --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 10b21d5cb5fd..2c6691d40c2a 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1814,6 +1814,13 @@ function addMissingIntermediateCertificate() { } logger.debug("hotfix for addon signing cert has not been applied; applying"); + // temporarily disable nocertb so we can write cert + const PREF_NOCERTDB = "security.nocertdb"; + let userNocertdb = Services.prefs.getBoolPref(PREF_NOCERTDB, true); + if (userNocertdb) { + Services.prefs.setBoolPref(PREF_NOCERTDB, false); + } + try { let certDB = Cc["@mozilla.org/security/x509certdb;1"].getService(Ci.nsIX509CertDB); certDB.addCertFromBase64(MISSING_INTERMEDIATE_CERTIFICATE, ",,"); @@ -1821,6 +1828,11 @@ function addMissingIntermediateCertificate() { } catch (e) { logger.error("failed to add new intermediate certificate:", e); return; + } finally { + // revert nocertdb pref to original value (even if exception thrown) + if (userNocertdb) { + Services.prefs.setBoolPref(PREF_NOCERTDB, true); + } } Services.prefs.setBoolPref(PREF_SIGNER_HOTFIXED, true);

1 0

[tor-browser/tor-browser-60.6.1esr-8.0-1] Bug 1549010: Part 2 - Bump DB schema version to force certificate reverification. r=zombie a=lizzard CLOSED TREE
by gk＠torproject.org 05 May '19

05 May '19

commit 421a5cdf1349d7fa0dfbbe7f1ee8146e435c1b97 Author: Kris Maglione <maglione.k(a)gmail.com> Date: Fri May 3 21:40:38 2019 -0700 Bug 1549010: Part 2 - Bump DB schema version to force certificate reverification. r=zombie a=lizzard CLOSED TREE Users who are affected by the intermediate add-on signing certificate expiry need their add-on signatures re-verified as soon as possible after updating to a version containging the fix. A database rebuild includes signature reverifications, so a schema version achieves this. Differential Revision: https://phabricator.services.mozilla.com/D29932 --HG-- extra : histedit_source : 11cf212be43f51f389efcc7862eaa83d97c346a9 --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index ddd337038659..d48e857159a5 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -152,7 +152,7 @@ const TOOLKIT_ID = "toolkit(a)mozilla.org"; const XPI_SIGNATURE_CHECK_PERIOD = 24 * 60 * 60; -XPCOMUtils.defineConstant(this, "DB_SCHEMA", 25); +XPCOMUtils.defineConstant(this, "DB_SCHEMA", 26); XPCOMUtils.defineLazyPreferenceGetter(this, "ALLOW_NON_MPC", PREF_ALLOW_NON_MPC);

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_29731_v2'
by boklm＠torproject.org 04 May '19

04 May '19

commit 5c0b72bce234088834297436ff20fc6942e935a3 Merge: b00d30e dd007eb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 3 21:24:40 2019 +0200 Merge remote-tracking branch 'gk/bug_29731_v2' projects/tor/build | 2 +- projects/tor/config | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 29731: Remove faketime for Windows builds
by boklm＠torproject.org 04 May '19

04 May '19

commit dd007eb1419dac3905a5aa53dbbab02bea19d92b Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 1 18:19:10 2019 +0000 Bug 29731: Remove faketime for Windows builds We link with `--no-insert-timestamp` when cross-compiling for Windows. This should make using `faketime` obsolete when building tor. It seems Rust does not like faking time and frequently hangs while compiling in that case. --- projects/tor/build | 2 +- projects/tor/config | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 0860b6f..7f9fd53 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -85,7 +85,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/osx") %]--enable-static-openssl[% END %] \ [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] -[% IF c("var/osx") || c("var/windows") -%] +[% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] diff --git a/projects/tor/config b/projects/tor/config index 3e7c45f..bf9ec5a 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -41,10 +41,6 @@ targets: var: arch_deps: - faketime - windows: - var: - arch_deps: - - faketime expert-bundle: var: expert_bundle: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_29307_v7'
by boklm＠torproject.org 03 May '19

03 May '19

commit b00d30e8a5a91533d8fc8c7786793b72348638cf Merge: e7c10d7 cfcb23a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 3 17:15:18 2019 +0200 Merge remote-tracking branch 'gk/bug_29307_v7' projects/argparse/build | 19 ++------ projects/argparse/config | 8 ---- projects/debootstrap-image/config | 23 +++------ projects/fteproxy/build | 24 ++-------- projects/fteproxy/config | 8 ---- projects/libfte/bug20302.patch | 36 -------------- projects/libfte/build | 24 ++-------- projects/libfte/config | 9 ---- projects/obfsproxy/build | 23 ++------- projects/obfsproxy/config | 8 ---- projects/parsley/build | 21 ++------- projects/parsley/config | 8 ---- projects/pycrypto/build | 28 +++-------- projects/pycrypto/config | 7 --- projects/pyptlib/build | 21 ++------- projects/pyptlib/config | 8 ---- projects/pyyaml/build | 21 ++------- projects/pyyaml/config | 8 ---- projects/rust/config | 1 + .../PTConfigs/windows/torrc-defaults-appendix | 3 -- projects/tor-browser/build | 8 ++-- projects/tor-browser/config | 15 +----- projects/twisted/build | 30 ++---------- projects/twisted/config | 8 ---- projects/txsocksx/build | 21 ++------- projects/txsocksx/config | 8 ---- projects/winpython/build | 36 -------------- projects/winpython/config | 55 ---------------------- projects/winpython/pyc-timestamp.sh | 18 ------- projects/winpython/wine-wrappers/common.py | 27 ----------- projects/winpython/wine-wrappers/dllwrap.py | 36 -------------- projects/winpython/wine-wrappers/g++.py | 39 --------------- projects/winpython/wine-wrappers/gcc.py | 36 -------------- projects/winpython/wine-wrappers/settings.py | 2 - projects/winpython/wine-wrappers/setup.py | 7 --- projects/zope.interface/build | 27 ++--------- projects/zope.interface/config | 9 ---- rbm.conf | 4 +- 38 files changed, 66 insertions(+), 628 deletions(-)

1 0

[tor-browser-build/master] Bug 29307: Use Stretch for cross-compiling for Windows
by boklm＠torproject.org 03 May '19

03 May '19

commit cfcb23a66e3ebd34b4df298f9e7550f1e0c97702 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 27 19:55:24 2019 +0000 Bug 29307: Use Stretch for cross-compiling for Windows --- projects/debootstrap-image/config | 23 ++++++----------------- projects/rust/config | 1 + projects/tor-browser/config | 3 --- rbm.conf | 2 +- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 7fa3551..99326dd 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -76,30 +76,19 @@ targets: suite: jessie arch: amd64 - jessie-i386: + stretch-amd64: var: - minimal_apt_version: 1.0.9.8.5 - # https://lists.debian.org/debian-lts-announce/2019/01/msg00014.html - apt_packages_baseurl: http://security.debian.org/debian-security/pool/updates/main/a/apt - apt_package_filename: apt_1.0.9.8.5_i386.deb - apt_package_sha256sum: 13c230e9c544b1e67a8da413046bf1728526372170533b1a23e70cc99c40a228 - apt_utils_package_filename: apt-utils_1.0.9.8.5_i386.deb - apt_utils_package_sha256sum: 1a74b12c8bb6b3968a721f3aa96739073e4fe2ced9302792c533e21535bc9cf4 - libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.5_i386.deb - libapt_inst_package_sha256sum: 5791661dd4ade72b61086fefdc209bd1f76ac7b7c812d6d4ba951b1a6232f0b9 - libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.5_i386.deb - libapt_pkg_package_sha256sum: 201b6cf4625ed175e6a024ac1f7ca6c526ca79d859753c125b02cd69e26c349d - + minimal_apt_version: 1.4.9 container: - suite: jessie - arch: i386 + suite: stretch + arch: amd64 - stretch-amd64: + stretch-i386: var: minimal_apt_version: 1.4.9 container: suite: stretch - arch: amd64 + 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' diff --git a/projects/rust/config b/projects/rust/config index 0c3b280..8d65fc6 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -82,6 +82,7 @@ targets: arch_deps: - libssl-dev - pkg-config + - zlib1g-dev configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu input_files: diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 2a8d455..39093d4 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -35,9 +35,6 @@ targets: var: arch_deps: - python-future - pre_pkginst: | - # enable jessie-backports for python-future - echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list windows-i686: var: mar_osname: win32 diff --git a/rbm.conf b/rbm.conf index e2d234b..9b99a14 100644 --- a/rbm.conf +++ b/rbm.conf @@ -294,7 +294,7 @@ targets: var: windows: 1 container: - suite: jessie + suite: stretch 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") %]'

1 0

[tor-browser-build/master] Bug 29319: Remove FTE support for Windows
by boklm＠torproject.org 03 May '19

03 May '19

commit 0c23af0c8c287a79a195de3df97bb70488e6ab23 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Feb 3 14:02:47 2019 +0000 Bug 29319: Remove FTE support for Windows We want to use our new mingw-w64/clang toolchain for our Windows cross-compilation, which requires a newer Wine among other updated components. We need to switch to Debian Stretch for that which is necessary anyway sooner or later given that Jessie is not properly maintained anymore. Updating to Stretch breaks FTE and fixing the breakage seems non-trivial. We therefore remove support for Windows where it existed (there was no 64bit support implemented yet, see: #24195) as it is planned to replace FTE with a new pluggable transport in the near future anyway. --- projects/argparse/build | 19 ++------ projects/argparse/config | 8 ---- projects/fteproxy/build | 24 ++-------- projects/fteproxy/config | 8 ---- projects/libfte/bug20302.patch | 36 -------------- projects/libfte/build | 24 ++-------- projects/libfte/config | 9 ---- projects/obfsproxy/build | 23 ++------- projects/obfsproxy/config | 8 ---- projects/parsley/build | 21 ++------- projects/parsley/config | 8 ---- projects/pycrypto/build | 28 +++-------- projects/pycrypto/config | 7 --- projects/pyptlib/build | 21 ++------- projects/pyptlib/config | 8 ---- projects/pyyaml/build | 21 ++------- projects/pyyaml/config | 8 ---- .../PTConfigs/windows/torrc-defaults-appendix | 3 -- projects/tor-browser/build | 8 ++-- projects/twisted/build | 30 ++---------- projects/twisted/config | 8 ---- projects/txsocksx/build | 21 ++------- projects/txsocksx/config | 8 ---- projects/winpython/build | 36 -------------- projects/winpython/config | 55 ---------------------- projects/winpython/pyc-timestamp.sh | 18 ------- projects/winpython/wine-wrappers/common.py | 27 ----------- projects/winpython/wine-wrappers/dllwrap.py | 36 -------------- projects/winpython/wine-wrappers/g++.py | 39 --------------- projects/winpython/wine-wrappers/gcc.py | 36 -------------- projects/winpython/wine-wrappers/settings.py | 2 - projects/winpython/wine-wrappers/setup.py | 7 --- projects/zope.interface/build | 27 ++--------- projects/zope.interface/config | 9 ---- rbm.conf | 2 +- 35 files changed, 57 insertions(+), 596 deletions(-) diff --git a/projects/argparse/build b/projects/argparse/build index 3d5b424..3170601 100644 --- a/projects/argparse/build +++ b/projects/argparse/build @@ -1,24 +1,13 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% ELSE -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/windows") -%] - pydir="$distdir/python" - mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) -[% ELSE -%] - python2 setup.py build --build-lib build - cp -a build/argparse.py $PTDIR/ -[% END -%] +python2 setup.py build --build-lib build +cp -a build/argparse.py $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/argparse/config b/projects/argparse/config index 730a4f1..87f80b0 100644 --- a/projects/argparse/config +++ b/projects/argparse/config @@ -12,16 +12,8 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - wine input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/a/argparse/argparse-[% c("version") %].tar.gz' sha256sum: ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/fteproxy/build b/projects/fteproxy/build index 6b6a82f..ea37d05 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -3,30 +3,14 @@ distdir="/var/tmp/dist/[% project %]" [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] tar -C $distdir -xf $rootdir/[% c('input_files_by_name/libfte') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/windows") -%] - pydir="$distdir/python" - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup_tbb.py py2exe - py2exe_zip_timestomp dist/fteproxy.zip - cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $PTDIR/fteproxy - cp -a fteproxy/VERSION $PTDIR/fteproxy - mkdir -p $PTDIR/fteproxy/defs - cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs - rm -Rf $pydir -[% ELSE -%] - cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper - chmod +x $PTDIR/fteproxy.wrapper - cp -a bin/fteproxy $PTDIR/fteproxy.bin - cp -ra fteproxy $PTDIR/ -[% END -%] +cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper +chmod +x $PTDIR/fteproxy.wrapper +cp -a bin/fteproxy $PTDIR/fteproxy.bin +cp -ra fteproxy $PTDIR/ cp -a {COPYING,README.md} $DOCSDIR/ cd $distdir [% c('tar', { diff --git a/projects/fteproxy/config b/projects/fteproxy/config index 06ea149..9f797c5 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -15,18 +15,10 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - wine input_files: - project: container-image - project: libfte name: libfte - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' - filename: fteproxy.wrapper enable: '[% c("var/linux") %]' diff --git a/projects/libfte/bug20302.patch b/projects/libfte/bug20302.patch deleted file mode 100644 index a190e1d..0000000 --- a/projects/libfte/bug20302.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a2cee5aaf51df9660de6df98ada6706546739d13 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Fri, 7 Oct 2016 09:10:41 +0000 -Subject: [PATCH] Compiling with GCC 6.4.0 based mingw-w64 is broken - -Due to a bug in Python (https://bugs.python.org/issue11566) compiling -with a GCC 6.4.0 based mingw-w64 is broken. This patch adds a workaround -for this issue. - -diff --git a/setup.py b/setup.py -index f546f1f..721b113 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,16 +11,16 @@ import os - - if os.name == 'nt': - libraries = ['gmp.dll'] -+ extra_compile_args=['-O3', '-fPIC', '-D_hypot=hypot'] - else: - libraries = ['gmp'] -+ extra_compile_args=['-O3', '-fPIC'] - - fte_cDFA = Extension('fte.cDFA', - include_dirs=['fte', - 'thirdparty/gmp/include', - ], -- extra_compile_args=['-O3', -- '-fPIC', -- ], -+ extra_compile_args=extra_compile_args, - library_dirs=['thirdparty/gmp/bin', - 'thirdparty/gmp/lib', - ], --- -2.9.3 - diff --git a/projects/libfte/build b/projects/libfte/build index 3eaeadb..638df7a 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -17,25 +17,11 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] export CXXFLAGS=-m32 export LDFLAGS=-m32 [% END -%] -[% IF c("var/windows") -%] - patch -p1 < $rootdir/bug20302.patch - pydir=$distdir/python - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" - export LD_PRELOAD= - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - # FTE only needs libgmp-10.dll and no libgmpxx anymore. - cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll . - cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll $distdir/TorBrowser/Tor/ - WINDOWS_BUILD=1 CROSS_COMPILE=1 make - $PYTHON setup.py install --prefix=$(wine winepath -w "$pydir") - $PYTHON setup.py install -[% ELSE -%] - export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] - make - cp -ra fte $PTDIR/ - mkdir -p $PTDIR/fteproxy-lib - cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib -[% END -%] +export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] +make +cp -ra fte $PTDIR/ +mkdir -p $PTDIR/fteproxy-lib +cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib cp -a {LICENSE,README.md} $DOCSDIR/ cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 cd $distdir diff --git a/projects/libfte/config b/projects/libfte/config index 415544f..365ad81 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -33,13 +33,6 @@ targets: apt-get download -q -y python-setuptools python-pkg-resources dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - windows-i686: - var: - compiler: winpython - arch_deps: - - wine - - faketime - input_files: - project: container-image - name: '[% c("var/compiler") %]' @@ -48,5 +41,3 @@ input_files: name: gmp - project: obfsproxy name: obfsproxy - - filename: bug20302.patch - enable: '[% c("var/windows") %]' diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build index 2c87e95..46f9b7a 100644 --- a/projects/obfsproxy/build +++ b/projects/obfsproxy/build @@ -3,10 +3,6 @@ distdir="/var/tmp/dist/[% project %]" [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% ELSE -%] -[% END -%] mkdir -p $distdir tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pycrypto') %] tar -C $distdir -xf $rootdir/[% c('input_files_by_name/twisted') %] @@ -19,21 +15,10 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/zope.interface') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/windows") -%] - pydir="$distdir/python" - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup_py2exe.py py2exe - $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) - py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip - cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/ - # http://bugs.winehq.org/show_bug.cgi?id=3591 - cp -a /var/tmp/dist/winpython/python27.dll $PTDIR -[% ELSE -%] - export PYTHON=python2 - $PYTHON setup.py build --build-lib build - cp -a build/obfsproxy $PTDIR/ - cp -a bin/obfsproxy $PTDIR/obfsproxy.bin -[% END -%] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/obfsproxy $PTDIR/ +cp -a bin/obfsproxy $PTDIR/obfsproxy.bin cp -a {LICENSE,README} $DOCSDIR cd $distdir [% c('tar', { diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config index 9286c61..9616eed 100644 --- a/projects/obfsproxy/config +++ b/projects/obfsproxy/config @@ -17,11 +17,6 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - wine input_files: - project: container-image @@ -41,6 +36,3 @@ input_files: name: txsocksx - project: zope.interface name: zope.interface - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/parsley/build b/projects/parsley/build index 7b6e632..e32060b 100644 --- a/projects/parsley/build +++ b/projects/parsley/build @@ -1,25 +1,14 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% ELSE -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/Parsley-[% c('version') %].tar.gz cd /var/tmp/build/Parsley-[% c('version') %] -[% IF c("var/windows") -%] - pydir="$distdir/python" - mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) -[% ELSE -%] - PYTHON=python2 - $PYTHON setup.py build --build-lib build - cp -a build/parsley.py build/ometa build/terml $PTDIR/ -[% END -%] +PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/parsley.py build/ometa build/terml $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/parsley/config b/projects/parsley/config index f305822..72d5bfc 100644 --- a/projects/parsley/config +++ b/projects/parsley/config @@ -12,16 +12,8 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - wine input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/P/Parsley/Parsley-[% c("version") %].tar.gz' sha256sum: 50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/pycrypto/build b/projects/pycrypto/build index ecb9bb8..3162296 100644 --- a/projects/pycrypto/build +++ b/projects/pycrypto/build @@ -4,10 +4,8 @@ set -e [% c("var/setarch") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/linux") -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] @@ -16,24 +14,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export CXXFLAGS=-m32 export LDFLAGS=-m32 [% END -%] -[% IF c("var/windows") -%] - pydir="$distdir/python" - mkdir -p "$pydir" - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" - export LD_PRELOAD=[% c("var/faketime_path") %] - # This is bogus, that we run the configure script in the build environment, - # but it seems to work. https://bugs.launchpad.net/pycrypto/+bug/1096207 for - # ac_cv_func_malloc_0_nonnull. - ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32 - export LD_PRELOAD= - $PYTHON setup.py build_ext -c mingw32 - $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) -[% ELSE -%] - export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] - ./configure --build=i686-linux-gnu [% c("var/configure_opt") %] - $PYTHON setup.py build --build-lib build - cp -a build/Crypto $PTDIR/ -[% END -%] +export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] +./configure --build=i686-linux-gnu [% c("var/configure_opt") %] +$PYTHON setup.py build --build-lib build +cp -a build/Crypto $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/pycrypto/config b/projects/pycrypto/config index 879484f..56fe397 100644 --- a/projects/pycrypto/config +++ b/projects/pycrypto/config @@ -30,13 +30,6 @@ targets: apt-get download -q -y python-setuptools python-pkg-resources dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - windows-i686: - var: - compiler: winpython - arch_deps: - - faketime - - wine - input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/projects/pyptlib/build b/projects/pyptlib/build index fa6d78d..1dc0c07 100644 --- a/projects/pyptlib/build +++ b/projects/pyptlib/build @@ -1,25 +1,14 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/linux") -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/windows") -%] - pydir="$distdir/python" - mkdir -p "$pydir" - $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) -[% ELSE -%] - export PYTHON=python2 - $PYTHON setup.py build --build-lib build - cp -a build/pyptlib $PTDIR/ -[% END -%] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/pyptlib $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/pyptlib/config b/projects/pyptlib/config index 36a6037..e8ca100 100644 --- a/projects/pyptlib/config +++ b/projects/pyptlib/config @@ -16,14 +16,6 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - wine input_files: - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/pyyaml/build b/projects/pyyaml/build index 72dc553..c10855c 100644 --- a/projects/pyyaml/build +++ b/projects/pyyaml/build @@ -1,25 +1,14 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% ELSE -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/PyYAML-[% c('version') %].tar.gz cd /var/tmp/build/PyYAML-[% c('version') %] -[% IF c("var/windows") -%] - pydir="$distdir/python" - mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) -[% ELSE -%] - export PYTHON=python2 - $PYTHON setup.py build --build-lib build - cp -a build/yaml $PTDIR/ -[% END -%] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/yaml $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/pyyaml/config b/projects/pyyaml/config index f2b928e..5324c10 100644 --- a/projects/pyyaml/config +++ b/projects/pyyaml/config @@ -12,16 +12,8 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - wine input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-[% c("version") %].tar.gz' sha256sum: c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 94d7fd9..7192231 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,6 +1,3 @@ -## fteproxy configuration -ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy.exe --managed - ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe diff --git a/projects/tor-browser/build b/projects/tor-browser/build index fc64ee1..1d73ff5 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -129,11 +129,9 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$T [% END %] [% END -%] [% IF c("var/windows") -%] - # We don't have snowflake available on Windows yet - # We don't have fte available on Windows x86_64 yet - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ - >> "$GENERATEDPREFSPATH" + # We don't have snowflake and FTE available on Windows (yet). + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js | \ + grep -v 'default_bridge\.fte' >> "$GENERATEDPREFSPATH" [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. diff --git a/projects/twisted/build b/projects/twisted/build index 9aebe24..3ce2eb0 100644 --- a/projects/twisted/build +++ b/projects/twisted/build @@ -2,10 +2,8 @@ [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% IF ! c("var/windows") -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 cd /var/tmp/build/Twisted-[% c('version') %] @@ -14,27 +12,9 @@ cd /var/tmp/build/Twisted-[% c('version') %] export CXXFLAGS=-m32 export LDFLAGS=-m32 [% END -%] -[% IF c("var/windows") -%] - pydir="$distdir/python" - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" - export LD_PRELOAD=[% c("var/faketime_path") %] - # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" - # rather than "Python.h". - ln -sf Python.h /var/tmp/dist/winpython/include/python.h - # We need to set the "mingw32" compiler to avoid an error in build_ext, but - # Twisted's "install" command calls build_ext unconditionally, whether the - # extensions have been built already or not, so we can't just call build_ext - # separately as with other packages. The "install" command doesn't recognize - # the -c option, so we set the compiler in a configuration file. - echo $'[build_ext]\ncompiler=mingw32' > setup.cfg - mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) -[% ELSE -%] - export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] - $PYTHON setup.py build --build-lib build - cp -a build/twisted $PTDIR/ -[% END -%] +export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] +$PYTHON setup.py build --build-lib build +cp -a build/twisted $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/twisted/config b/projects/twisted/config index d9a7eeb..bbe3fc5 100644 --- a/projects/twisted/config +++ b/projects/twisted/config @@ -31,14 +31,6 @@ targets: apt-get download -q -y python-setuptools python-pkg-resources dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - windows-i686: - var: - compiler: winpython - arch_deps: - - p7zip-full - - faketime - - wine - input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2' diff --git a/projects/txsocksx/build b/projects/txsocksx/build index 3491d11..3491a26 100644 --- a/projects/txsocksx/build +++ b/projects/txsocksx/build @@ -1,12 +1,8 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% ELSE -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] @@ -15,16 +11,9 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . mkdir vcversioner-1.14.1.1-py2.7.egg -[% IF c("var/windows") -%] - pydir="$distdir/python" - mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install_lib --install-dir=$(wine winepath -w "$pydir/Lib/site-packages") -[% ELSE -%] - export PYTHON=python2 - $PYTHON setup.py build --build-lib build - cp -a build/txsocksx $PTDIR/ -[% END -%] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/txsocksx $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/txsocksx/config b/projects/txsocksx/config index 061af53..6142943 100644 --- a/projects/txsocksx/config +++ b/projects/txsocksx/config @@ -14,14 +14,6 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - wine input_files: - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/winpython/build b/projects/winpython/build deleted file mode 100644 index db78a0f..0000000 --- a/projects/winpython/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -set -e -[% 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 %]" -mkdir -p $distdir -WINEROOT=$HOME/.wine/drive_c -wine wineboot -i -wine msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir -sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $distdir/Lib/distutils/cygwinccompiler.py -tar xf setuptools-*.tar.gz -rm setuptools-*.tar.gz -cd setuptools-* -wine $distdir/python.exe setup.py install -cd $rootdir -7z x $rootdir/py2exe-*.exe -cp -a PLATLIB/* $distdir/Lib/site-packages/ -export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" -export LD_PRELOAD=[% c("var/faketime_path") %] -cd wine-wrappers -# Push our config into wine-wrappers. -> settings.py -echo "LD_PRELOAD = \"$LD_PRELOAD\"" >> settings.py -echo "FAKETIME = \"$FAKETIME\"" >> settings.py -# Must pre-copy python27.dll into the build directory, or else py2exe can't find it. -mkdir -p build/bdist.win32/winexe/bundle-2.7/ -cp -a $distdir/python27.dll build/bdist.win32/winexe/bundle-2.7/ -LD_PRELOAD= wine $distdir/python.exe setup.py py2exe -mkdir -p $distdir/wineroot/windows/ -cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $distdir/wineroot/windows/ -cp $rootdir/pyc-timestamp.sh $distdir/ -cd $distdir/.. -[% c('tar', { - tar_src => [ project, 'mingw-w64' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/winpython/config b/projects/winpython/config deleted file mode 100644 index 124b3b6..0000000 --- a/projects/winpython/config +++ /dev/null @@ -1,55 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2.7.5 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' - -var: - compiler: mingw-w64 - arch_deps: - - p7zip-full - - faketime - - wine - container: - use_container: 1 - setup: | - [% pc('mingw-w64', 'var/setup') %] - # wine path ($HOME/.wine) gets included in some binaries, so set HOME - # to a fixed path. - export HOME=/var/tmp/home - mkdir -p $HOME - WINEROOT=$HOME/.wine/drive_c - wine wineboot -i - cp -a /var/tmp/dist/winpython/wineroot/windows/* $WINEROOT/windows/ - export PYTHON="wine /var/tmp/dist/winpython/python.exe" - - # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. - function py2exe_zip_timestomp { - ZIPFILE="$1" - local tmpdir="$(mktemp -d)" - local tmpzip="$(mktemp -u)" - unzip -d "$tmpdir" "$ZIPFILE" - cd "$tmpdir" - find . -name '*.pyc' -print0 | xargs -0 /var/tmp/dist/winpython/pyc-timestamp.sh "2000-01-01 00:00:00" - [% c('zip', { - zip_src => [ '.' ], - zip_args => '$tmpzip', - }) %] - cd - - mv -f "$tmpzip" "$ZIPFILE" - rm -rf "$tmpdir" - } - - -input_files: - - project: container-image - - URL: 'https://www.python.org/ftp/python/[% c("version") %]/python-[% c("version") %].msi' - file_gpg_id: 1 - sig_ext: asc - gpg_keyring: winpython.gpg - - URL: https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.tar.gz - sha256sum: 75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 - - URL: https://downloads.sourceforge.net/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe - sha256sum: 610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - filename: wine-wrappers - - filename: pyc-timestamp.sh diff --git a/projects/winpython/pyc-timestamp.sh b/projects/winpython/pyc-timestamp.sh deleted file mode 100755 index e092268..0000000 --- a/projects/winpython/pyc-timestamp.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Usage: pyc-timestamp.sh "2001-01-01" FILENAMES... -# Overwrite (in place) the timestamp in .pyc Python bytecode files. -# -# http://hg.python.org/cpython/file/2.7/Lib/py_compile.py#l123 -# http://nedbatchelder.com/blog/200804/the_structure_of_pyc_files.html -# http://benno.id.au/blog/2013/01/15/python-determinism - -TIMESPEC="$1" -shift - -hex=$(printf 0x%08x $(date +%s --date="$TIMESPEC")) -# Write little-endian. -esc=$(printf "\\\\x%02x\\\\x%02x\\\\x%02x\\\\x%02x" $(($hex&0xff)) $((($hex>>8)&0xff)) $((($hex>>16)&0xff)) $((($hex>>24)&0xff))) -for filename in "$@"; do - echo $filename - echo -n -e "$esc" | dd of="$filename" bs=1 seek=4 conv=notrunc -done diff --git a/projects/winpython/wine-wrappers/common.py b/projects/winpython/wine-wrappers/common.py deleted file mode 100644 index 19e994b..0000000 --- a/projects/winpython/wine-wrappers/common.py +++ /dev/null @@ -1,27 +0,0 @@ -import os -import subprocess - -import settings - -def winepath(windowspath): - """Convert a Windows path to a Unix path.""" - return subprocess.check_output(["winepath", "-u", windowspath])[:-1] - -def search_startswith(a, elems): - """Search for the first element of the array a that startswith any of the - members of elems, and return it. Return None if no match was found.""" - for e in elems: - if a.startswith(e): - return e - return None - -def popen_faketime(*args, **kwargs): - """Does subprocess.Popen after setting faketime environment variables.""" - ld_preload = os.getenv("LD_PRELOAD") - if ld_preload: - # ld.so(8): "The items of [LD_PRELOAD] can be separated by spaces or colons." - ld_preload += ":" - ld_preload += settings.LD_PRELOAD - os.putenv("LD_PRELOAD", ld_preload) - os.putenv("FAKETIME", settings.FAKETIME) - return subprocess.Popen(*args, **kwargs) diff --git a/projects/winpython/wine-wrappers/dllwrap.py b/projects/winpython/wine-wrappers/dllwrap.py deleted file mode 100755 index 300a3bd..0000000 --- a/projects/winpython/wine-wrappers/dllwrap.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -# A wrapper for i686-w64-mingw32-dllwrap that removes -mno-cygwin and converts -# Windows paths to Unix paths, so that the w64-mingw32 dllwrap can be called by -# Python distutils. - -import os -import subprocess -import sys - -import common - -args = ["/var/tmp/dist/mingw-w64/bin/i686-w64-mingw32-dllwrap"] -sys.argv.pop(0) -while sys.argv: - a = sys.argv.pop(0) - if not a.startswith("-"): - args.append(common.winepath(a)) - continue - if a == "-mno-cygwin": - continue - if a in ("-I", "-L", "-s", "--def", "--output-lib"): - args.append(a) - args.append(common.winepath(sys.argv.pop(0))) - continue - o = common.search_startswith(a, ("-I", "-L", "--def=", "--output-lib=")) - if o is not None: - path = a[len(o):] - args.append("%s%s" % (o, common.winepath(path))) - continue - args.append(a) -p = common.popen_faketime(args, stderr=subprocess.PIPE) -stderr = p.stderr.read() -sys.stderr.write(stderr) -if " error: " in stderr: - sys.exit(1) diff --git a/projects/winpython/wine-wrappers/g++.py b/projects/winpython/wine-wrappers/g++.py deleted file mode 100755 index a71c4e3..0000000 --- a/projects/winpython/wine-wrappers/g++.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python - -# A wrapper for i686-w64-mingw32-g++ that removes -mno-cygwin and converts -# Windows paths to Unix paths, so that the w64-mingw32 g++ can be called by -# Python distutils. - -import os -import subprocess -import sys - -import common - -args = ["/var/tmp/dist/mingw-w64/bin/i686-w64-mingw32-g++"] -sys.argv.pop(0) -while sys.argv: - a = sys.argv.pop(0) - if not a.startswith("-"): - args.append(common.winepath(a)) - continue - if a == "-mno-cygwin": - continue - if a == "--output-lib": - o = sys.argv.pop(0) - a = "-out-implib="+o - if a in ("-I", "-L"): - args.append(a) - args.append(common.winepath(sys.argv.pop(0))) - continue - o = common.search_startswith(a, ("-I", "-L")) - if o is not None: - path = a[len(o):] - args.append("%s%s" % (o, common.winepath(path))) - continue - args.append(a) -p = common.popen_faketime(args, stderr=subprocess.PIPE) -stderr = p.stderr.read() -sys.stderr.write(stderr) -if " error: " in stderr: - sys.exit(1) diff --git a/projects/winpython/wine-wrappers/gcc.py b/projects/winpython/wine-wrappers/gcc.py deleted file mode 100755 index 3db89b4..0000000 --- a/projects/winpython/wine-wrappers/gcc.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -# A wrapper for i686-w64-mingw32-gcc that removes -mno-cygwin and converts -# Windows paths to Unix paths, so that the w64-mingw32 gcc can be called by -# Python distutils. - -import os -import subprocess -import sys - -import common - -args = ["/var/tmp/dist/mingw-w64/bin/i686-w64-mingw32-gcc"] -sys.argv.pop(0) -while sys.argv: - a = sys.argv.pop(0) - if not a.startswith("-"): - args.append(common.winepath(a)) - continue - if a == "-mno-cygwin": - continue - if a in ("-I", "-L"): - args.append(a) - args.append(common.winepath(sys.argv.pop(0))) - continue - o = common.search_startswith(a, ("-I", "-L")) - if o is not None: - path = a[len(o):] - args.append("%s%s" % (o, common.winepath(path))) - continue - args.append(a) -p = common.popen_faketime(args, stderr=subprocess.PIPE) -stderr = p.stderr.read() -sys.stderr.write(stderr) -if " error: " in stderr: - sys.exit(1) diff --git a/projects/winpython/wine-wrappers/settings.py b/projects/winpython/wine-wrappers/settings.py deleted file mode 100644 index f395433..0000000 --- a/projects/winpython/wine-wrappers/settings.py +++ /dev/null @@ -1,2 +0,0 @@ -LD_PRELOAD = "/usr/lib/faketime/libfaketime.so.1" -FAKETIME = "2000-01-01 00:00:00" diff --git a/projects/winpython/wine-wrappers/setup.py b/projects/winpython/wine-wrappers/setup.py deleted file mode 100644 index f80f2c0..0000000 --- a/projects/winpython/wine-wrappers/setup.py +++ /dev/null @@ -1,7 +0,0 @@ -from distutils.core import setup -import py2exe -setup( - console=["gcc.py", "g++.py", "dllwrap.py"], - zipfile=None, - options={"py2exe": {"bundle_files": 1, "compressed": True}} -) diff --git a/projects/zope.interface/build b/projects/zope.interface/build index b126989..23501a3 100644 --- a/projects/zope.interface/build +++ b/projects/zope.interface/build @@ -1,31 +1,14 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/linux") -%] - [% c("var/set_PTDIR_DOCSDIR") -%] - mkdir -p $PTDIR -[% END -%] -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR mkdir -p /var/tmp/build unzip -d /var/tmp/build $rootdir/[% project %]-[% c('version') %].zip cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/windows") -%] - find -type f -print0 | xargs -0 [% c("var/touch") %] - pydir="$distdir/python" - mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" - LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32 - $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) - # Must create this file in order for py2exe to find the package. - touch $pydir/Lib/site-packages/zope/__init__.py -[% ELSE -%] - export PYTHON=python2 - $PYTHON setup.py build --build-lib build - cp -a build/zope $PTDIR/ -[% END -%] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/zope $PTDIR/ cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/zope.interface/config b/projects/zope.interface/config index ffba3df..9743b79 100644 --- a/projects/zope.interface/config +++ b/projects/zope.interface/config @@ -12,17 +12,8 @@ targets: arch_deps: - python-setuptools - python-dev - windows-i686: - var: - compiler: winpython - arch_deps: - - faketime - - wine input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-[% c("version") %].zip' sha256sum: 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/rbm.conf b/rbm.conf index 9e4fc78..e2d234b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -290,7 +290,6 @@ targets: export RBM_SETARCH=1 exec setarch i686 ./build fi - fteproxy: 1 windows: var: windows: 1 @@ -301,6 +300,7 @@ targets: 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 + fteproxy: 0 deps: - build-essential - python

1 0

[tor-browser-build/master] Revert "Bug 29868: Fix installation of python-future package"
by boklm＠torproject.org 03 May '19

03 May '19

commit b8c497a4eb16f8ea80914d6def714115977b6c11 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 27 19:53:13 2019 +0000 Revert "Bug 29868: Fix installation of python-future package" This reverts commit f2e272082fc484f211e0539dc177b1948c4b5d68. --- projects/tor-browser/config | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e8c0b23..2a8d455 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -32,15 +32,12 @@ targets: - genisoimage - faketime windows: - pre: | - # Bug 29868: jessie-backports don't exist anymore, so we download the - # package we need from snapshot.debian.org - # We can remove this when we switch to Stretch (bug 29307) - DEBIAN_FRONTEND=noninteractive dpkg -i python-future_*_all.deb var: arch_deps: - # python-configparser is required by python-future - - python-configparser + - python-future + pre_pkginst: | + # enable jessie-backports for python-future + echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list windows-i686: var: mar_osname: win32 @@ -115,13 +112,6 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533… sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' - # Bug 29868: jessie-backports don't exist anymore, so we download the - # package we need from snapshot.debian.org - # We can remove this when we switch to Stretch (bug 29307) - - name: python-future - URL: https://snapshot.debian.org/archive/debian/20190104T031048Z/pool/main/p/pyt… - sha256sum: da39bbc41a6143f68eb7b8d774aad8fe2483947c4e567c9b27f6a8455981450d - enable: '[% c("var/windows") %]' # To generate a new keystore, see how-to-generate-keystore.txt - filename: android-qa.keystore enable: '[% c("var/android") %]'

1 0