- tbb-commits - lists.torproject.org

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

23 Feb '17

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

1 0

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

23 Feb '17

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

1 0

[tor-browser-bundle/hardened-builds] Bug 17034: Use our built binutils and GCC for building tor
by gk＠torproject.org 22 Feb '17

22 Feb '17

commit 74bbd039cfb80ad4f9ea9147d8637209076ae84b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 21 11:24:38 2017 +0000 Bug 17034: Use our built binutils and GCC for building tor --- gitian/descriptors/linux/gitian-tor.yml | 38 +++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index fa0aead..3b3427b 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -32,6 +32,10 @@ script: | export LC_ALL=C umask 0022 + mkdir -p $INSTDIR/Data/Tor/ + mkdir -p $INSTDIR/Tor/ + mkdir -p $INSTDIR/Debug/Tor/ + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 @@ -39,13 +43,32 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - mkdir -p $INSTDIR/Data/Tor/ - mkdir -p $INSTDIR/Tor/ - mkdir -p $INSTDIR/Debug/Tor/ + # Preparing Binutils and GCC for tor + unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip + # Make sure gold is used with the hardening wrapper for full RELRO, see + # #13031. + cd $INSTDIR/binutils/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 + cd ~/build + unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip + # Make sure we use the hardening wrapper when compiling tor. + cd $INSTDIR/gcc/bin + cp /usr/bin/hardened-cc ./ + mv gcc gcc.real + mv c++ c++.real + ln -sf hardened-cc gcc + ln -sf hardened-cc c++ + cd ~/build + export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + # Make sure our GCC gets properly used. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 + unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR libevent-linux$GBUILD_BITS-utils.zip - unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip - unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ @@ -61,14 +84,11 @@ script: | chmod 700 $INSTDIR/Tor/*so* # This is needed to make RPATH unavailable. See bug 9150. - export LD_LIBRARY_PATH="$INSTDIR/Tor" - export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTDIR/Tor/" # Building tor cd tor git update-index --refresh -q - mkdir -p $OUTDIR/src - #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --enable-expensive-hardening --disable-asciidoc --prefix=$INSTDIR --with-openssl-dir=$INSTDIR/openssl --with-libevent-dir=$INSTDIR/libevent

1 0

[tor-browser-bundle/master] Bug 17034: Use our built binutils and GCC for building tor
by gk＠torproject.org 22 Feb '17

22 Feb '17

commit d6fa3b07207f33bda05d9f9f8e147a2b5d764a12 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 21 11:24:38 2017 +0000 Bug 17034: Use our built binutils and GCC for building tor --- gitian/descriptors/linux/gitian-tor.yml | 43 +++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index bfb683a..c00b4e7 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -24,6 +24,8 @@ files: - "openssl-linux64-utils.zip" - "libevent-linux32-utils.zip" - "libevent-linux64-utils.zip" +- "binutils-linux32-utils.zip" +- "binutils-linux64-utils.zip" - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" script: | @@ -34,6 +36,10 @@ script: | export LC_ALL=C umask 0022 + mkdir -p $INSTDIR/Data/Tor/ + mkdir -p $INSTDIR/Tor/ + mkdir -p $INSTDIR/Debug/Tor/ + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 @@ -41,12 +47,37 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - mkdir -p $INSTDIR/Data/Tor/ - mkdir -p $INSTDIR/Tor/ - mkdir -p $INSTDIR/Debug/Tor/ + # Preparing Binutils and GCC for tor + unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip + # Make sure gold is used with the hardening wrapper for full RELRO, see + # #13031. + cd $INSTDIR/binutils/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 + cd ~/build + unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip + # Make sure we use the hardening wrapper when compiling tor. + cd $INSTDIR/gcc/bin + cp /usr/bin/hardened-cc ./ + mv gcc gcc.real + mv c++ c++.real + ln -sf hardened-cc gcc + ln -sf hardened-cc c++ + cd ~/build + export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + ARCH="" + if [ $GBUILD_BITS == "64" ]; + then + ARCH="64" + fi + # Make sure our GCC gets properly used. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH + unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR libevent-linux$GBUILD_BITS-utils.zip - unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ @@ -65,13 +96,11 @@ script: | chmod 700 $INSTDIR/Tor/*so* # This is needed to make RPATH unavailable. See bug 9150. - export LD_LIBRARY_PATH="$INSTDIR/Tor/" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTDIR/Tor/" # Building tor cd tor git update-index --refresh -q - mkdir -p $OUTDIR/src - #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR

1 0

[torbutton/master] Fixup for wrong error message
by gk＠torproject.org 21 Feb '17

21 Feb '17

commit 932ea5e4cd6c7a79815e2320f52cca23bf347cc7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 21 14:21:34 2017 +0000 Fixup for wrong error message --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 990a990..fca72b6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1117,7 +1117,7 @@ function torbutton_do_new_identity() { m_tb_prefs.clearUserPref("general.open_location.last_url"); } } catch(e) { - torbutton_log(3, "Exception on wifi token clear: "+e); + torbutton_log(3, "Exception on clearing last opened location: "+e); } torbutton_log(3, "New Identity: Closing tabs and clearing searchbox");

1 0

[tor-browser-build/master] Add a testbuild target
by boklm＠torproject.org 17 Feb '17

17 Feb '17

commit 52ad50f034e007a72936be8775ad111bc968a42d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 17 15:27:47 2017 +0100 Add a testbuild target --- .gitignore | 1 + Makefile | 15 +++++++++++++++ README | 6 ++++++ projects/release/config | 6 ++++++ projects/tor-browser/build | 10 +++++++--- rbm.conf | 11 +++++++++++ rbm.local.conf.example | 15 +++++++++++++++ 7 files changed, 61 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e38b069..9b6754f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ alpha alpha_nightly nightly hardened +testbuild rbm.local.conf logs diff --git a/Makefile b/Makefile index ca46c9e..9481537 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,21 @@ alpha_nightly-windows-i686: submodule-update alpha_nightly-osx-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 +testbuild: submodule-update + $(rbm) build release --target testbuild --target torbrowser-all + +testbuild-linux-x86_64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 + +testbuild-linux-i686: submodule-update + $(rbm) build release --target testbuild --target torbrowser-linux-i686 + +testbuild-windows-i686: submodule-update + $(rbm) build release --target testbuild --target torbrowser-windows-i686 + +testbuild-osx-x86_64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 + hardened-linux-x86_64: submodule-update $(rbm) build release --target hardened --target torbrowser-linux-x86_64 diff --git a/README b/README index e3672ec..a14fb42 100644 --- a/README +++ b/README @@ -70,6 +70,12 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 +When you want to quickly do a build to test a change, you can use the +testbuild makefile target, and find the build in the testbuild directory. +The build will be the same as regular alpha builds, except that in order +to make the build faster, only the en-US locale will be built, and no +mar file will be created. + Updating git sources -------------------- diff --git a/projects/release/config b/projects/release/config index febe801..e2b2eb9 100644 --- a/projects/release/config +++ b/projects/release/config @@ -54,6 +54,12 @@ targets: var: build_target: alpha + testbuild: + output_dir: 'testbuild' + version: '.' + var: + build_target: torbrowser-testbuild + hardened_nightly: output_dir: 'hardened_nightly' version: '[% c("var/today") %]' diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 3763b21..f952a95 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -240,9 +240,13 @@ python $MARTOOLS/createprecomplete.py popd cd $distdir -# Create full MAR file and compressed package. -MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar -MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" + +[% IF c("var/build_mar") -%] + # Create full MAR file and compressed package. + MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" +[% END -%] + [% IF c("var/linux") %] [% c('tar', { tar_src => [ '$PKG_DIR' ], diff --git a/rbm.conf b/rbm.conf index 5faf4cb..5a29308 100644 --- a/rbm.conf +++ b/rbm.conf @@ -10,6 +10,7 @@ var: torbrowser_version: '6.5n' project_name: tor-browser multi_lingual: 0 + build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed # in the same order. In the cases where the installation order is @@ -63,6 +64,16 @@ targets: var: multi_lingual: 1 + torbrowser-testbuild: + - testbuild + - alpha + testbuild: + var: + # To make build faster, don't build any locale + locales: [] + # Don't create mar files to save time + build_mar: 0 + torbrowser-linux-x86_64: - linux-x86_64 - linux diff --git a/rbm.local.conf.example b/rbm.local.conf.example index ac54935..2a86647 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -39,4 +39,19 @@ var: ### file. #sign_build_gpg_opts: '--local-user XXXXXXXX' +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + # vim: filetype=yaml sw=2

1 0

[tor-browser-build/master] Update rbm: Suppress unneeded output in docker_remote_get
by boklm＠torproject.org 16 Feb '17

16 Feb '17

commit 7d44af3b7b137ccb0adc560d3c90e8dc1783a976 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 16 22:30:11 2017 +0100 Update rbm: Suppress unneeded output in docker_remote_get --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index b0382cc..b3ca063 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b0382ccc58b9286e066bf5980f80cf041e287067 +Subproject commit b3ca063713f0d25a66f76c829d750ac977a25207

1 0

[tor-browser-build/master] Add Windows Expert Bundle
by boklm＠torproject.org 16 Feb '17

16 Feb '17

commit 3f018465411dc2ad20f6087f1fdc863d116f1578 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 16 22:33:07 2017 +0100 Add Windows Expert Bundle --- projects/release/config | 8 ++++++++ projects/tor/build | 22 +++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/projects/release/config b/projects/release/config index 0b3727f..febe801 100644 --- a/projects/release/config +++ b/projects/release/config @@ -103,6 +103,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-osx-x86_64 + - name: windows-expert-bundle + project: tor + enable: '[% c("var/torbrowser-windows-i686") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-windows-i686 + - expert-bundle build: | #!/bin/sh @@ -112,6 +119,7 @@ build: | mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ + mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ [% END -%] [% IF c("var/torbrowser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ diff --git a/projects/tor/build b/projects/tor/build index 1f42add..f0b57f1 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -108,15 +108,23 @@ done mkdir -p [% dest_dir _ '/' _ c('filename') %] [% - IF c("var/osx"); - SET tarsrcdir = [ 'Contents' ]; + IF c("var/expert_bundle"); + c('zip', { + zip_src => [ 'Data', 'Tor', ], + zip_args => dest_dir _ '/' _ c('filename') _ '/tor-win32-' _ c("version") _ '.zip', + }); ELSE; - SET tarsrcdir = [ 'Data', 'Tor', ]; + IF c("var/osx"); + SET tarsrcdir = [ 'Contents' ]; + ELSE; + SET tarsrcdir = [ 'Data', 'Tor', ]; + END; + c('tar', { + tar_src => tarsrcdir, + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor.tar.gz', + }); END; - c('tar', { - tar_src => tarsrcdir, - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor.tar.gz', - }) %] +%] [% IF c("var/linux") %] [% c('tar', {

1 0

[rbm/master] Suppress unneeded output in docker_remote_get
by boklm＠torproject.org 16 Feb '17

16 Feb '17

commit b3ca063713f0d25a66f76c829d750ac977a25207 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 16 14:02:53 2017 +0100 Suppress unneeded output in docker_remote_get --- lib/RBM/DefaultConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index ec03ff0..2f6264e 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -497,7 +497,7 @@ tmpdir=\$(mktemp -d) %] cd \$tmpdir tar -cf - . | tar -C [% dst %] --no-same-owner -xf - -cd - +cd - > /dev/null rm -Rf \$tmpdir OPT_END ####

1 0

[tor-browser-build/master] Use binutils 2.24, and Ubuntu-12.04 for Windows builds
by boklm＠torproject.org 15 Feb '17

15 Feb '17

commit 7f083aadfe1fd9264c5a5022a3c47f06849eb1e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 17:34:11 2017 +0100 Use binutils 2.24, and Ubuntu-12.04 for Windows builds To be closer to what we currently have in gitian, use binutils 2.24. We also change tho OS to Ubuntu 12.04 for Windows builds, except for the tor-browser bundle step, where we are staying with 14.10. We are using 14.10 in the tor-browser step because the version of python-pefile we use fails on Ubuntu 12.04. The reason for using a recent version of python-pefile is that the older versions don't work on x86_64. And we are using an x86_64 container because docker does not support i386 containers. The problem is not present in gitian where we are using an i386 VM. An other possible solution could be to build a recent version of python. --- projects/binutils/build | 4 +- projects/binutils/config | 7 +- projects/binutils/enable-reloc-section-ld.patch | 48 ++++----- projects/binutils/peXXigen.patch | 14 +++ projects/binutils/specify-timestamp.patch | 123 ------------------------ projects/firefox/build | 12 +++ projects/firefox/config | 3 + projects/gcc/config | 3 + projects/tor-browser/config | 1 + rbm.conf | 2 +- 10 files changed, 63 insertions(+), 154 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index 3ff4bdb..b7a6e72 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -23,9 +23,7 @@ cd [% project %]-[% c("version") %] sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch -# specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> -# https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ -patch -p2 < ../specify-timestamp.patch +patch -p1 < ../peXXigen.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j4 diff --git a/projects/binutils/config b/projects/binutils/config index dfb1483..c1e67df 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.25 +version: 2.24 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 var: @@ -18,8 +18,5 @@ input_files: - project: docker-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' - - # specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> - # https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ - - filename: specify-timestamp.patch + - filename: peXXigen.patch enable: '[% c("var/windows") %]' diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch index 15ab4d8..f393f51 100644 --- a/projects/binutils/enable-reloc-section-ld.patch +++ b/projects/binutils/enable-reloc-section-ld.patch @@ -1,9 +1,10 @@ -From 6ef8bae3d2a4f4704c4a32f786c9574db3e70f25 Mon Sep 17 00:00:00 2001 +From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. + --- ld/emultempl/pe.em | 6 +++++ ld/emultempl/pep.em | 8 ++++++- @@ -12,18 +13,18 @@ Patch by skruffy. 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 979cc8b8e960..4a63863289c8 100644 +index 5d6da9e..14c07f7 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -274,6 +274,7 @@ fragment <<EOF +@@ -268,6 +268,7 @@ fragment <<EOF + #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) + /* Determinism. */ #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) - #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) - #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) static void gld${EMULATION_NAME}_add_options -@@ -317,6 +318,7 @@ gld${EMULATION_NAME}_add_options +@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -31,7 +32,7 @@ index 979cc8b8e960..4a63863289c8 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -787,6 +789,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -41,7 +42,7 @@ index 979cc8b8e960..4a63863289c8 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -2059,6 +2064,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) if (link_info.shared #if !defined(TARGET_IS_shpe) || (!link_info.relocatable && pe_def_file->num_exports != 0) @@ -50,20 +51,20 @@ index 979cc8b8e960..4a63863289c8 100644 ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b24a60820237..caf294663a80 100644 +index b738800..b566903 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -248,7 +248,8 @@ enum options +@@ -242,7 +242,8 @@ enum options + OPTION_NO_BIND, + OPTION_WDM_DRIVER, OPTION_INSERT_TIMESTAMP, - OPTION_NO_INSERT_TIMESTAMP, - OPTION_TERMINAL_SERVER_AWARE, -- OPTION_BUILD_ID -+ OPTION_BUILD_ID, +- OPTION_TERMINAL_SERVER_AWARE ++ OPTION_TERMINAL_SERVER_AWARE, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -290,6 +291,7 @@ gld${EMULATION_NAME}_add_options +@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -71,7 +72,7 @@ index b24a60820237..caf294663a80 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -743,6 +745,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -81,7 +82,7 @@ index b24a60820237..caf294663a80 100644 case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1838,6 +1843,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1618,6 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT if (link_info.shared @@ -90,10 +91,10 @@ index b24a60820237..caf294663a80 100644 { pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index 61d8fa5c7eea..24c0c72a6685 100644 +index e9e133b..4230dc3 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; +@@ -152,6 +152,7 @@ def_file * pe_def_file = 0; int pe_dll_export_everything = 0; int pe_dll_exclude_all_symbols = 0; int pe_dll_do_default_excludes = 1; @@ -199,10 +200,10 @@ index 61d8fa5c7eea..24c0c72a6685 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 24ea30237aeb..6a0d6338646b 100644 +index 4697390..2bf71d9 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h -@@ -30,6 +30,7 @@ extern def_file *pe_def_file; +@@ -31,6 +31,7 @@ extern def_file *pe_def_file; extern int pe_dll_export_everything; extern int pe_dll_exclude_all_symbols; extern int pe_dll_do_default_excludes; @@ -210,3 +211,6 @@ index 24ea30237aeb..6a0d6338646b 100644 extern int pe_dll_kill_ats; extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; +-- +2.0.1 + diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch new file mode 100644 index 0000000..785aa02 --- /dev/null +++ b/projects/binutils/peXXigen.patch @@ -0,0 +1,14 @@ +diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c +*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 +--- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 +*************** +*** 795,800 **** +--- 795,802 ---- + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); diff --git a/projects/binutils/specify-timestamp.patch b/projects/binutils/specify-timestamp.patch deleted file mode 100644 index 37f4347..0000000 --- a/projects/binutils/specify-timestamp.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- a/upstream/bfd/peXXigen.c -+++ b/upstream/bfd/peXXigen.c -@@ -66,6 +66,9 @@ - #include <wchar.h> - #endif - -+#include <errno.h> -+#include <limits.h> -+ - /* NOTE: it's strange to be including an architecture specific header - in what's supposed to be general (to PE/PEI) code. However, that's - where the definitions are, and they don't vary per architecture -@@ -873,8 +876,36 @@ - H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); - - /* Only use a real timestamp if the option was chosen. */ -- if ((pe_data (abfd)->insert_timestamp)) -- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, filehdr_out->f_timdat); -+ } - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); ---- a/upstream/ld/pe-dll.c -+++ b/upstream/ld/pe-dll.c -@@ -26,6 +26,8 @@ - #include "filenames.h" - #include "safe-ctype.h" - -+#include <errno.h> -+#include <limits.h> - #include <time.h> - - #include "ld.h" -@@ -1185,8 +1187,36 @@ - - memset (edata_d, 0, edata_sz); - -- if (pe_data (abfd)->insert_timestamp) -- H_PUT_32 (abfd, time (0), edata_d + 4); -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, edata_d + 4); -+ } - - if (pe_def_file->version_major != -1) - { ---- a/upstream/ld/emultempl/pe.em -+++ b/upstream/ld/emultempl/pe.em -@@ -307,7 +307,7 @@ - OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, - {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, - {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - #ifdef DLL_SUPPORT - /* getopt allows abbreviations, so we do this to stop it ---- a/upstream/ld/emultempl/pep.em -+++ b/upstream/ld/emultempl/pep.em -@@ -324,7 +324,7 @@ - {"no-bind", no_argument, NULL, OPTION_NO_BIND}, - {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, - {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, - {NULL, no_argument, NULL, 0} diff --git a/projects/firefox/build b/projects/firefox/build index 67547f7..a8ef12f 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,6 +1,18 @@ #!/bin/bash set -e rootdir=$(pwd) +[% IF c("var/windows") -%] + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gcc') %] + hgccdir=/var/tmp/dist/gcc + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + ln -s gcc $hgccdir/bin/cc + # Make sure our GCC (as host compiler) get used. We do that before + # compiler setup so that mingw is first in the PATH. + export LD_LIBRARY_PATH=$hgccdir/lib64 + export PATH=$hgccdir/bin:$PATH +[% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/firefox/config b/projects/firefox/config index 578d353..96be619 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -89,3 +89,6 @@ input_files: - URL: https://people.torproject.org/~mikeperry/mirrors/sources/msvcr100.dll sha256sum: 1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 enable: '[% c("var/windows") %]' + - project: gcc + name: gcc + enable: '[% c("var/windows") %]' diff --git a/projects/gcc/config b/projects/gcc/config index 7a89e44..bf73b7d 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -38,6 +38,9 @@ targets: osx-x86_64: var: configure_opt: --enable-multilib --enable-languages=c,c++ + windows-i686: + var: + configure_opt: --disable-multilib --enable-languages=c,c++ input_files: - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 5ee8be7..95f444d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -24,6 +24,7 @@ targets: - bzip2 - faketime windows-i686: + distribution: Ubuntu-14.10 var: mar_osname: win32 diff --git a/rbm.conf b/rbm.conf index 802bb48..5faf4cb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -107,7 +107,7 @@ targets: torbrowser-windows-i686: - windows-i686 windows-i686: - distribution: Ubuntu-14.10 + distribution: Ubuntu-12.04 arch: i686 var: windows: 1

1 0