- tbb-commits - lists.torproject.org

[tor-browser-build/master] README.HACKING: explain how to test a firefox patch
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit cebdaf3303a4165f200d20e6d9f8c04ea90f15e2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 11:48:13 2017 +0200 README.HACKING: explain how to test a firefox patch --- README.HACKING | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.HACKING b/README.HACKING index 2687ed1..221cc90 100644 --- a/README.HACKING +++ b/README.HACKING @@ -198,6 +198,30 @@ To find the resulting file from the build, you can use 'ls -ltr out/tor/' to find the file with the last modification time. +Patching Firefox (or an other component) +---------------------------------------- + +If you want to test a firefox patch, the easiest way to do it is to +copy the patch file to the projects/firefox/ directory, then edit +projects/firefox/config to add the new patch to the list of input_files: + + - filename: patch-for-XXXX.patch + +Then edit projects/firefox/build to add a line somewhere (probably just +before running the configure script) to apply the patch: + + patch -p1 < $rootdir/patch-for-XXXX.patch + +You can now run 'make testbuild' (or an other build target) to start a +build with the patch. + +As an alternative, if you have your patch in a git repository, you can +edit projects/firefox/config to change the git_url option to point to +your git repository, and change the git_hash option to point to the +commit you want to build. You will also need to comment the +'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). + + Debugging a build error -----------------------

1 0

[tor-browser-build/master] Fix var/publish_dir for nightly, alpha_nightly and testbuild
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48deeaa2fc6caeb378623c4d4cb1fc1142b9774a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:27:55 2017 +0200 Fix var/publish_dir for nightly, alpha_nightly and testbuild Fix an error introduced by 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8. --- projects/release/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/release/config b/projects/release/config index ee318c2..b785878 100644 --- a/projects/release/config +++ b/projects/release/config @@ -39,15 +39,15 @@ targets: nightly: output_dir: 'nightly' - publish_dir: '[% c("var/today") %]' var: build_target: nightly + publish_dir: '[% c("var/today") %]' alpha_nightly: output_dir: 'alpha_nightly' - publish_dir: '[% c("var/today") %]' var: build_target: alpha + publish_dir: '[% c("var/today") %]' alpha: output_dir: 'alpha/unsigned' @@ -56,9 +56,9 @@ targets: testbuild: output_dir: 'testbuild' - publish_dir: '' var: build_target: torbrowser-testbuild + publish_dir: '' input_files:

1 0

[tor-browser-build/master] Remove hardened targets
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48b01dee52a63cb0f490b6303cb2a4e93855c118 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:24:19 2017 +0200 Remove hardened targets --- .gitignore | 1 - Makefile | 3 --- projects/release/config | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7c83e82..c4c3919 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ /alpha /alpha_nightly /nightly -/hardened /testbuild /rbm.local.conf /logs diff --git a/Makefile b/Makefile index 274e11c..c45b0a1 100644 --- a/Makefile +++ b/Makefile @@ -77,9 +77,6 @@ testbuild-windows-i686: submodule-update 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 - signtag-release: submodule-update $(rbm) build release --step signtag --target release diff --git a/projects/release/config b/projects/release/config index db62a95..ee318c2 100644 --- a/projects/release/config +++ b/projects/release/config @@ -60,17 +60,6 @@ targets: var: build_target: torbrowser-testbuild - hardened_nightly: - output_dir: 'hardened_nightly' - publish_dir: '[% c("var/today") %]' - var: - build_target: hardened - - hardened: - output_dir: 'hardened' - var: - build_target: hardened - input_files: # Release

1 0

[tor-browser-build/master] Fix faketime path in ddmg.sh
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 9a732cfa7e869ff50f679c9bdaa964892fa80328 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:10:54 2017 +0200 Fix faketime path in ddmg.sh --- projects/tor-browser/ddmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index 20bd8f9..a715300 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -10,7 +10,7 @@ pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] -export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 +export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755

1 0

[tor-browser-build/master] tbb-7.5a4-build2
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 4195b8f52cc7e380e44f281f80f148e361a3b2e0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:11:21 2017 +0200 tbb-7.5a4-build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 4efc57c..523a005 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,7 +15,7 @@ buildconf: var: torbrowser_version: '7.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] winpython: use wine to run python.exe
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit b67299f66b4f43deaf532b68a7cbca9cce60ba43 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:04:20 2017 +0200 winpython: use wine to run python.exe We need wine to run python.exe. It seems it was working without explicitely using wine on my build machine, probably because of the binfmt configuration in the kernel of that machine. --- projects/winpython/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/winpython/build b/projects/winpython/build index 2a30acc..5f53b9c 100644 --- a/projects/winpython/build +++ b/projects/winpython/build @@ -25,7 +25,7 @@ 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= $distdir/python.exe setup.py py2exe +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/

1 0

[tor-browser-bundle/master] Fix typos in changelog
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit e5a74a3aa67c15a093c15a9f40fa221acf2f74fb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 9 11:57:50 2017 +0000 Fix typos in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 272bd74..aa0c5a8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser 7.5a4 -- August 9 2017 * Bug 22618: Downloading pdf file via file:/// is stalling * Bug 22542: Resize slider window to work without scrollbars * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up @@ -52,7 +52,7 @@ Tor Browser 7.0.4 -- August 8 2017 * Update Tor to 0.3.0.10 * Update Torbutton to 1.9.7.5 * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up

1 0

[tor-browser-build/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit cdb545afe64aa22364f2a7e08e0afe27a1f60129 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 16:44:15 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- rbm.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index 6745cdc..4efc57c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -274,8 +274,11 @@ gpg_wrapper: | SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; END; -%] - if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ - && [ "$2" = '--verify' ] + # git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 + if ( [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] ) \ + || ( [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] ) then [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]}

1 0

[tor-browser-bundle/maint-7.0] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit ddfbe17d6b6a83fc3c7fda2e6737d33221f8539c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0

[tor-browser-bundle/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit 6b1c63cc05cd28a55a241296808eef448bdf96f3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0