- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.0.2esr-7.0-2] Getting Tor Browser to build with accessibility enabled on Windows
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 1be3aec99fc7731563715dcfc7724fcd7ca4a6fb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 10 11:05:34 2017 +0000 Getting Tor Browser to build with accessibility enabled on Windows Patch by Jacek Caban --- ipc/mscom/Interceptor.h | 2 +- other-licenses/ia2/IA2TypeLibrary.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipc/mscom/Interceptor.h b/ipc/mscom/Interceptor.h index ecddbdd..88acdf6 100644 --- a/ipc/mscom/Interceptor.h +++ b/ipc/mscom/Interceptor.h @@ -112,7 +112,7 @@ CreateInterceptor(STAUniquePtr<InterfaceT> aTargetInterface, return E_INVALIDARG; } - REFIID iidTarget = __uuidof(aTargetInterface); + REFIID iidTarget = __uuidof(InterfaceT); STAUniquePtr<IUnknown> targetUnknown(aTargetInterface.release()); return Interceptor::Create(Move(targetUnknown), aEventSink, iidTarget, diff --git a/other-licenses/ia2/IA2TypeLibrary.idl b/other-licenses/ia2/IA2TypeLibrary.idl index 2519aca..97aa08b 100644 --- a/other-licenses/ia2/IA2TypeLibrary.idl +++ b/other-licenses/ia2/IA2TypeLibrary.idl @@ -68,7 +68,7 @@ cpp_quote("") library IAccessible2Lib { importlib ("stdole2.tlb"); - importlib ("oleacc.dll"); + //importlib ("oleacc.dll"); interface IAccessible2; interface IAccessible2_2; interface IAccessible2_3;

1 0

[tor-browser-bundle/master] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 50b6e6fff4a535044f9b506854535df757125267 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 14 12:10:08 2017 -0400 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in a bundle ID of org.torproject.torbrowser. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 6f3d3ad..4a756b8 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -96,7 +96,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 6355485..efa7acf 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build # diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index ef956fc..fabc40d 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -77,7 +77,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/

1 0

[tor-browser-bundle/hardened-builds] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 84f386e0783e1972db72b94df755766a5eb6e9ce Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 14 12:10:08 2017 -0400 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in an bundle ID of org.torproject.torbrowser. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 002005f..8d38b3a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -96,7 +96,7 @@ script: | # Self-Rando wrapper export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" export SELFRANDO_skip_shuffle= - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Without disabling LSan our build is blowing up: # https://bugs.torproject.org/10599#comment:52 diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 49b659a..417c7e6 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build # diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 8b68925..2825569 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -77,7 +77,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/

1 0

[tor-browser-bundle/hardened-builds] Bug 21833 Update libvirt check for 16.10
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 676200bdfeb1c8550082c16639ac952ff514db9c Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 29 11:42:41 2017 -0500 Bug 21833 Update libvirt check for 16.10 --- gitian/check-prerequisites.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 530e160..d6e79fd 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -15,6 +15,7 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + FULL_VERSION=`cat /etc/issue | grep -Eo '[0-9.]+' | head -1` if [ "$VERSION" -ge "14" ]; then dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring curl pkg-config libgtk2.0-dev libglib2.0-dev torsocks tor 2>/dev/null >/dev/null @@ -124,7 +125,15 @@ then then libvirt_group=libvirt else - libvirt_group=libvirtd + if [ "$FULL_VERSION" = "16.10" ]; + then + libvirt_group=libvirt + elif [ "$VERSION" -gt "16" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi fi groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ];

1 0

[tor-browser-bundle/maint-6.5] Bug 21833 Update libvirt check for 16.10
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 667a61b60c9caf3feb1d96d4c19b4a3d7f2d6ca5 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 29 11:42:41 2017 -0500 Bug 21833 Update libvirt check for 16.10 --- gitian/check-prerequisites.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 858fd4d..711698d 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -15,6 +15,7 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + FULL_VERSION=`cat /etc/issue | grep -Eo '[0-9.]+' | head -1` if [ "$VERSION" -ge "14" ]; then dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring torsocks tor 2>/dev/null >/dev/null @@ -124,7 +125,15 @@ then then libvirt_group=libvirt else - libvirt_group=libvirtd + if [ "$FULL_VERSION" = "16.10" ]; + then + libvirt_group=libvirt + elif [ "$VERSION" -gt "16" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi fi groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ];

1 0

[tor-browser-bundle/master] Bug 21833 Update libvirt check for 16.10
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit c95c5d1b57685c2eff102f809ec2cf9c865a6215 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 29 11:42:41 2017 -0500 Bug 21833 Update libvirt check for 16.10 --- gitian/check-prerequisites.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 530e160..d6e79fd 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -15,6 +15,7 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + FULL_VERSION=`cat /etc/issue | grep -Eo '[0-9.]+' | head -1` if [ "$VERSION" -ge "14" ]; then dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring curl pkg-config libgtk2.0-dev libglib2.0-dev torsocks tor 2>/dev/null >/dev/null @@ -124,7 +125,15 @@ then then libvirt_group=libvirt else - libvirt_group=libvirtd + if [ "$FULL_VERSION" = "16.10" ]; + then + libvirt_group=libvirt + elif [ "$VERSION" -gt "16" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi fi groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ];

1 0

[tor-browser-bundle/hardened-builds] Bug 21709: Upgrade Go to 1.7.5.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b26f04ec07d3de68cc1db8d71935e208415b08fa Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 11 11:18:03 2017 -0800 Bug 21709: Upgrade Go to 1.7.5. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index a1f8bff..cfcbb61 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,7 +67,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -121,7 +121,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 145c9f9..8ea22e0 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -73,7 +73,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ELFUTILS_VER=0.160 @@ -127,7 +127,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a diff --git a/gitian/versions.beta b/gitian/versions.beta index 65b6546..ec3fcb7 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -56,7 +56,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -107,7 +107,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5fde922..59bc494 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -76,7 +76,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ELFUTILS_VER=0.160 @@ -130,7 +130,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a

1 0

[tor-browser-bundle/master] Bug 21709: Upgrade Go to 1.7.5.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 1942f7b2f6e5f82c64dcfeab82713604866cb26f Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 11 11:18:03 2017 -0800 Bug 21709: Upgrade Go to 1.7.5. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index cf07564..a13cc08 100755 --- a/gitian/versions +++ b/gitian/versions @@ -65,7 +65,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -117,7 +117,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b677fd1..2655f23 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -68,7 +68,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -120,7 +120,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.beta b/gitian/versions.beta index e962c20..ed7c124 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -54,7 +54,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -99,7 +99,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7a57980..4fdc685 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -75,7 +75,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -127,7 +127,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-browser-bundle/master] Bug 10369: Don't use old GCC toolchain anymore for utils
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit e32cc7890a13d1707e9f3109fd8e888ac8623537 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 16 14:39:40 2017 +0000 Bug 10369: Don't use old GCC toolchain anymore for utils We start using clang as the cross-compiler as we already do in the tor and Firefox descriptor. This should give us better code and should make the build more robust. --- gitian/descriptors/mac/gitian-utils.yml | 145 ++++++++++++++++---------------- 1 file changed, 73 insertions(+), 72 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 55d6c7f..0025e43 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -4,7 +4,6 @@ distro: "debian" suites: - "wheezy" architectures: -- "i386" - "amd64" packages: - "faketime" @@ -25,8 +24,8 @@ remotes: "dir": "cmake" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" -- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "openssl.tar.gz" +- "cctools.tar.gz" - "versions" - "dzip.sh" - "libfaketime.patch" @@ -37,78 +36,80 @@ script: | export LC_ALL=C umask 0022 - if [ $GBUILD_BITS == "64" ]; - then - # Cmake first - cd cmake - ./bootstrap --prefix=$INSTDIR/cmake - make $MAKEOPTS - make install - export PATH=$PATH:$INSTDIR/cmake/bin - # Clang - cd ../llvm - mv ../clang tools/ - export LLVM_HOME=`pwd` - mkdir build - cd build - cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$INSTDIR/clang -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME - make $MAKEOPTS - make install - cd $INSTDIR - ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang - cp *utils.zip $OUTDIR/ - else - # Building libfaketime. - cd faketime - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/libfaketime.patch - make - DESTDIR="$INSTDIR/faketime" make install - export FAKETIME_SKIP_CMDS="make" - export FAKETIME=$REFERENCE_DATETIME - cd .. + # Cmake first + cd cmake + ./bootstrap --prefix=$INSTDIR/cmake + make $MAKEOPTS + make install + export PATH=$PATH:$INSTDIR/cmake/bin - # dpkg requires sbin directories in the PATH - export PATH="/usr/sbin:/sbin:$PATH" - sudo dpkg -i *.deb - tar xaf multiarch-darwin*tar.xz - export PATH="$PATH:$HOME/build/apple-osx/bin/" - # For OpenSSL - ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc + # Clang + cd ../llvm + mv ../clang tools/ + export LLVM_HOME=`pwd` + mkdir build + cd build + cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$INSTDIR/clang -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME + make $MAKEOPTS + make install - # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + # Building libfaketime. + cd ../../faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch + make + DESTDIR="$INSTDIR/faketime" make install + export FAKETIME_SKIP_CMDS="make" + export FAKETIME=$REFERENCE_DATETIME - # Building Libevent - cd libevent - ./autogen.sh - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - make $MAKEOPTS - make install - cd .. + cd .. + ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb + tar xaf data.tar.gz + tar xaf cctools.tar.gz - # Building OpenSSL - # We still need libfaketime here it seems, see #19856 for details. - tar xzf openssl.tar.gz - cd openssl-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. - ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 - # Using $MAKEOPTS breaks the build. Might be the issue mentioned on - # http://cblfs.cross-lfs.org/index.php/OpenSSL. - make - make install - cd .. + # Preparing clang for cross-compilation, setting the proper flags and + # variables + # ld needs libLTO.so from llvm + export LD_LIBRARY_PATH="$INSTDIR/clang/lib" + export PATH="$HOME/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="$HOME/build/cctools" + CROSS_SYSROOT="$HOME/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" + export CC="$INSTDIR/clang/bin/clang $FLAGS" + export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" - # Grabbing the results - cd $INSTDIR - ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl - ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent - cp *utils.zip $OUTDIR/ - fi + # Building Libevent + cd libevent + ./autogen.sh + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + ./configure --disable-static --host=x86_64-apple-darwin10 --prefix=$INSTDIR/libevent + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + make $MAKEOPTS + make install + cd .. + + # Building OpenSSL + # XXX: We still need libfaketime here it seems, see #19856 for details. + # XXX: Check whether that's true after switching to clang as cross-compiler. + # Tricking OpenSSL into using our clang as cross-compiler + export CC="cc $FLAGS" + ln -s $INSTDIR/clang/bin/clang x86_64-apple-darwin10-cc + export PATH=$PATH:$HOME/build + tar xzf openssl.tar.gz + cd openssl-* + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + ./Configure --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 + # Using $MAKEOPTS breaks the build. Might be the issue mentioned on + # http://cblfs.cross-lfs.org/index.php/OpenSSL. + make + make install + cd .. + + # Grabbing the results + cd $INSTDIR + ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang + ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl + ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent + cp *utils.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Bug 21753: Replace our old GCC toolchain in PT descriptor
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 2fe7170ac1f07b051fa69183b7dc852a62d4f9be Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 16 18:05:06 2017 +0000 Bug 21753: Replace our old GCC toolchain in PT descriptor The GCC toolchain is pretty old and it is risky relying on it. We replace it with our clang/cctools-based one which is already used almost everywhere when cross-compiling for macOS. --- .../mac/gitian-pluggable-transports.yml | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 5f47b47..c6846cc 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -4,7 +4,7 @@ distro: "debian" suites: - "wheezy" architectures: -- "i386" +- "amd64" packages: - "unzip" - "zip" @@ -28,8 +28,9 @@ files: - "versions" - "go14.tar.gz" - "go.tar.gz" +- "clang-linux64-wheezy-utils.zip" +- "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" -- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -44,7 +45,6 @@ script: | DOCSDIR="$TBDIR/TorBrowser/Docs" TORBINDIR="$TBDIR/TorBrowser/Tor" fi - export LIBRARY_PATH="$INSTDIR/lib" export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -53,14 +53,19 @@ script: | mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # - tar xaf multiarch-darwin*tar.xz + tar xaf cctools.tar.gz + unzip clang-linux64-wheezy-utils.zip # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6 tar xaf MacOSX10.7.sdk.tar.gz - export PATH="$PATH:$HOME/build/apple-osx/bin/" - # - export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar - export CC=$HOME/build/apple-osx/bin/i686-apple-darwin11-gcc - export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ + # Preparing clang for cross-compilation, setting the proper flags and + # variables + # ld needs libLTO.so from llvm + export LD_LIBRARY_PATH="$HOME/build/clang/lib" + export PATH="$HOME/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="$HOME/build/cctools" + CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk" + FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" + export CC="$HOME/build/clang/bin/clang $FLAGS" # Building go 1.4.x # This is needed to bootstrap the go that we actually use @@ -80,12 +85,12 @@ script: | # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS -isysroot $HOME/build/MacOSX10.7.sdk -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=darwin - export GOARCH=386 + export GOARCH=amd64 tar xvf go.tar.gz cd go/src # Remove a preprocessor directive that causes problems when building with the 10.7 SDK.

1 0

[tor-browser-bundle/master] Bug 21754: Remove old GCC toolchain and macOS SDK
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 11780c5d6d84c860cc9fa389cb08e1bf4680d7de Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 20 09:06:02 2017 +0000 Bug 21754: Remove old GCC toolchain and macOS SDK We remove all hints to our old GCC-based toolchain for macOS and switch our descriptors to use the 10.7 SDK as 10.9 is the minimum requirement for Firefox 52 ESR now. We clean up the tor macOS descriptor a bit as well, removing unused environment variables and replacing '/home/debian' with '$HOME' as done in the utils descriptor. --- gitian/descriptors/mac/gitian-tor.yml | 20 ++++++++------------ gitian/descriptors/mac/gitian-utils.yml | 7 +++---- gitian/fetch-inputs.sh | 6 +++--- gitian/verify-tags.sh | 4 ++-- gitian/versions | 6 ------ gitian/versions.alpha | 6 ------ gitian/versions.beta | 8 ++------ gitian/versions.nightly | 6 ------ 8 files changed, 18 insertions(+), 45 deletions(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 946f915..2e1fa3e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -17,7 +17,7 @@ remotes: files: - "clang-linux64-wheezy-utils.zip" - "cctools.tar.gz" -- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "MacOSX10.7.sdk.tar.gz" - "versions" - "dzip.sh" - "openssl-mac64-utils.zip" @@ -43,10 +43,8 @@ script: | mkdir -p $TORCONFIGDIR/ mkdir -p $OUTDIR/ - # Extracting and copying all the necessary utilities and libraries. We still - # need the 10.6 SDK if we want to support OSX 10.6. - ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb - tar xaf data.tar.gz + # Extracting and copying all the necessary utilities and libraries. + tar xaf MacOSX10.7.sdk.tar.gz tar xaf cctools.tar.gz unzip clang-linux64-wheezy-utils.zip unzip -d $INSTDIR openssl-mac64-utils.zip @@ -56,14 +54,12 @@ script: | # Setting the proper flags and variables # ld needs libLTO.so from llvm - export LD_LIBRARY_PATH="/home/debian/build/clang/lib" - export PATH="/home/debian/build/cctools/bin:$PATH" - CROSS_CCTOOLS_PATH="/home/debian/build/cctools" - CROSS_SYSROOT="/home/debian/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + export LD_LIBRARY_PATH="$HOME/build/clang/lib" + export PATH="$HOME/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="$HOME/build/cctools" + CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk" FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" - export CC="/home/debian/build/clang/bin/clang $FLAGS" - export CPP="/home/debian/build/clang/bin/clang $FLAGS -E" - export LLVMCONFIG="/home/debian/build/clang/bin/llvm-config" + export CC="$HOME/build/clang/bin/clang $FLAGS" export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" # Building tor diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 0025e43..9191c52 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -23,7 +23,7 @@ remotes: - "url": "https://cmake.org/cmake.git" "dir": "cmake" files: -- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "MacOSX10.7.sdk.tar.gz" - "openssl.tar.gz" - "cctools.tar.gz" - "versions" @@ -65,8 +65,7 @@ script: | export FAKETIME=$REFERENCE_DATETIME cd .. - ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb - tar xaf data.tar.gz + tar xaf MacOSX10.7.sdk.tar.gz tar xaf cctools.tar.gz # Preparing clang for cross-compilation, setting the proper flags and @@ -75,7 +74,7 @@ script: | export LD_LIBRARY_PATH="$INSTDIR/clang/lib" export PATH="$HOME/build/cctools/bin:$PATH" CROSS_CCTOOLS_PATH="$HOME/build/cctools" - CROSS_SYSROOT="$HOME/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk" FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" export CC="$INSTDIR/clang/bin/clang $FLAGS" export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index f141381..3be1fa2 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,7 +132,7 @@ do fi done -for i in TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 +for i in OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -173,8 +173,8 @@ done wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +# (OpenSSL is signed with MD5, and OSXSDK are not signed at all) +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 4b17550..f1d89d4 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -148,8 +148,8 @@ do done # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +# (OpenSSL is signed with MD5, and OSXSDK are not signed at all) +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 69abeb3..cbc323e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -74,10 +74,8 @@ NSIS_VER=2.51 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz -OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -105,8 +103,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -133,9 +129,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3539d59..8a0e184 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -77,10 +77,8 @@ NSIS_VER=2.51 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz -OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -108,8 +106,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -136,9 +132,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… diff --git a/gitian/versions.beta b/gitian/versions.beta index d7db1fd..e962c20 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -60,9 +60,8 @@ GO_VER=1.7.4 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz -OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -87,8 +86,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -112,8 +110,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2045034..c7fb5bf 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -84,10 +84,8 @@ NSIS_VER=2.51 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz -OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -115,8 +113,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -143,9 +139,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP…

1 0

[tor-browser-bundle/master] Bug 19783: Remove unused macOS helper scripts
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit d744cac29e8df0efaf1a6bb3a626be90e930c118 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 17 14:44:45 2017 +0000 Bug 19783: Remove unused macOS helper scripts After remmoving the last remnants of our old GCC based macOS toolchain in bug 10369 and bug 21753 we can now safely remove the helper scripts used for it as well. May they rest in peace. --- gitian/build-helpers/i686-apple-darwin11-g++ | 2 -- gitian/build-helpers/i686-apple-darwin11-gcc | 2 -- gitian/build-helpers/i686-apple-darwin11-ld | 2 -- 3 files changed, 6 deletions(-) diff --git a/gitian/build-helpers/i686-apple-darwin11-g++ b/gitian/build-helpers/i686-apple-darwin11-g++ deleted file mode 100755 index 90c794a..0000000 --- a/gitian/build-helpers/i686-apple-darwin11-g++ +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/apple-osx/bin/apple-osx-g++ -isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/ -mmacosx-version-min=10.6 -DMAXOSX_DEPLOYEMENT_TARGET=10.6 "$@" diff --git a/gitian/build-helpers/i686-apple-darwin11-gcc b/gitian/build-helpers/i686-apple-darwin11-gcc deleted file mode 100755 index ba6f6bf..0000000 --- a/gitian/build-helpers/i686-apple-darwin11-gcc +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/apple-osx/bin/apple-osx-gcc -isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/ -mmacosx-version-min=10.6 -DMAXOSX_DEPLOYEMENT_TARGET=10.6 "$@" diff --git a/gitian/build-helpers/i686-apple-darwin11-ld b/gitian/build-helpers/i686-apple-darwin11-ld deleted file mode 100755 index 05e5f89..0000000 --- a/gitian/build-helpers/i686-apple-darwin11-ld +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/apple-osx/bin/i686-apple-darwin11-ld -syslibroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/ -macosx_version_min 10.6 "$@"

1 0

[tor-browser-bundle/master] Bug 21328: Updating to clang 3.8.0
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit cd4465477ac10d2b740d5a32505cdab5a197e405 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 31 17:21:51 2017 +0000 Bug 21328: Updating to clang 3.8.0 We use the new compiler Mozilla is using for Firefox 52 cross-builds as well. clang now requires GCC 4.8.5 for compiling which is not available in Debian Wheezy. We therefore build the macOS parts on Debian Jessie now. --- gitian/descriptors/mac/gitian-bundle.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 7 +++--- .../mac/gitian-pluggable-transports.yml | 6 ++--- gitian/descriptors/mac/gitian-tor.yml | 8 +++--- gitian/descriptors/mac/gitian-utils.yml | 27 ++++++++++++++------- gitian/fetch-inputs.sh | 8 +++--- gitian/gpg/CFE.gpg | Bin 0 -> 2507 bytes gitian/gpg/LIBCXX.gpg | Bin 0 -> 2507 bytes gitian/gpg/LIBCXXABI.gpg | Bin 0 -> 2507 bytes gitian/gpg/LLVM.gpg | Bin 0 -> 2507 bytes gitian/mkbundle-mac.sh | 6 ++--- gitian/verify-tags.sh | 4 +-- gitian/versions | 12 ++++++--- gitian/versions.alpha | 12 ++++++--- gitian/versions.nightly | 12 ++++++--- 15 files changed, 65 insertions(+), 39 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 571c6e0..8c7bbfc 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -2,7 +2,7 @@ name: "bundle-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index aae6139..6355485 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -2,7 +2,7 @@ name: "torbrowser-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: @@ -16,7 +16,7 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "clang-linux64-wheezy-utils.zip" +- "clang-linux64-jessie-utils.zip" - "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" - "get-moz-build-date" @@ -39,7 +39,7 @@ script: | # Extracting all the necessary tools tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz - unzip ../clang-linux64-wheezy-utils.zip + unzip ../clang-linux64-jessie-utils.zip # Bug 20439: build with PIE # If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi # with libtool giving an error: @@ -96,7 +96,6 @@ script: | ~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST rm -f tmp.plist ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja - ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/browser/omni.ja cd TorBrowser.app/ ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index c6846cc..c430bb8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -2,7 +2,7 @@ name: "pluggable-transports-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: @@ -28,7 +28,7 @@ files: - "versions" - "go14.tar.gz" - "go.tar.gz" -- "clang-linux64-wheezy-utils.zip" +- "clang-linux64-jessie-utils.zip" - "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" - "dzip.sh" @@ -54,7 +54,7 @@ script: | mkdir -p $OUTDIR/ # tar xaf cctools.tar.gz - unzip clang-linux64-wheezy-utils.zip + unzip clang-linux64-jessie-utils.zip # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6 tar xaf MacOSX10.7.sdk.tar.gz # Preparing clang for cross-compilation, setting the proper flags and diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 2e1fa3e..cb3e99b 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -2,7 +2,7 @@ name: "tor-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: @@ -15,7 +15,7 @@ remotes: - "url": "https://git.torproject.org/tor.git" "dir": "tor" files: -- "clang-linux64-wheezy-utils.zip" +- "clang-linux64-jessie-utils.zip" - "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" - "versions" @@ -46,7 +46,7 @@ script: | # Extracting and copying all the necessary utilities and libraries. tar xaf MacOSX10.7.sdk.tar.gz tar xaf cctools.tar.gz - unzip clang-linux64-wheezy-utils.zip + unzip clang-linux64-jessie-utils.zip unzip -d $INSTDIR openssl-mac64-utils.zip unzip -d $INSTDIR libevent-mac64-utils.zip cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/ @@ -70,7 +70,7 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --enable-static-openssl --disable-asciidoc --host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 make $MAKEOPTS make install cd $INSTDIR diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 9191c52..33a8bf2 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -2,11 +2,10 @@ name: "utils-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: -- "faketime" - "automake" - "libtool" - "zip" @@ -16,14 +15,14 @@ remotes: "dir": "libevent" - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" -- "url": "https://github.com/llvm-mirror/llvm" - "dir": "llvm" -- "url": "https://github.com/llvm-mirror/clang" - "dir": "clang" - "url": "https://cmake.org/cmake.git" "dir": "cmake" files: - "MacOSX10.7.sdk.tar.gz" +- "llvm.tar.xz" +- "cfe.tar.xz" +- "libcxx.tar.xz" +- "libcxxabi.tar.xz" - "openssl.tar.gz" - "cctools.tar.gz" - "versions" @@ -44,8 +43,18 @@ script: | export PATH=$PATH:$INSTDIR/cmake/bin # Clang - cd ../llvm - mv ../clang tools/ + cd .. + tar xaf llvm.tar.xz + tar xaf cfe.tar.xz + tar xaf libcxx.tar.xz + tar xaf libcxxabi.tar.xz + mv cfe-* clang + mv libcxx-* libcxx + mv libcxxabi-* libcxxabi + mv clang llvm-*/tools + mv libcxx llvm-*/projects + mv libcxxabi llvm-*/projects + cd llvm-* export LLVM_HOME=`pwd` mkdir build cd build @@ -108,7 +117,7 @@ script: | # Grabbing the results cd $INSTDIR - ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang + ~/build/dzip.sh clang-$CLANG_VER-linux64-jessie-utils.zip clang ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 3be1fa2..44f96aa 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -113,7 +113,7 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@ -233,6 +233,10 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 +ln -sf "$LLVM_PACKAGE" llvm.tar.xz +ln -sf "$CFE_PACKAGE" cfe.tar.xz +ln -sf "$LIBCXX_PACKAGE" libcxx.tar.xz +ln -sf "$LIBCXXABI_PACKAGE" libcxxabi.tar.xz ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz @@ -275,8 +279,6 @@ torbutton https://git.torproject.org/torbutton.git $TORBU tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG cmake https://cmake.org/cmake.git $CMAKE_TAG -llvm https://github.com/llvm-mirror/llvm $LLVM_TAG -clang https://github.com/llvm-mirror/clang $CLANG_TAG mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG diff --git a/gitian/gpg/CFE.gpg b/gitian/gpg/CFE.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/CFE.gpg differ diff --git a/gitian/gpg/LIBCXX.gpg b/gitian/gpg/LIBCXX.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/LIBCXX.gpg differ diff --git a/gitian/gpg/LIBCXXABI.gpg b/gitian/gpg/LIBCXXABI.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/LIBCXXABI.gpg differ diff --git a/gitian/gpg/LLVM.gpg b/gitian/gpg/LLVM.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/LLVM.gpg differ diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 789cc80..7f02f05 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -135,7 +135,7 @@ fi cd $GITIAN_DIR -if [ ! -f inputs/clang-$CLANG_VER-linux64-wheezy-utils.zip -o \ +if [ ! -f inputs/clang-$CLANG_VER-linux64-jessie-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip ]; then @@ -151,7 +151,7 @@ then cd inputs cp -a ../build/out/*-utils.zip . - ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip + ln -sf clang-$CLANG_VER-linux64-jessie-utils.zip clang-linux64-jessie-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip cd .. @@ -164,7 +164,7 @@ else # We might have built the utilities in the past but maybe the links are # pointing to the wrong version. Refresh them. cd inputs - ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip + ln -sf clang-$CLANG_VER-linux64-jessie-utils.zip clang-linux64-jessie-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip cd .. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index f1d89d4..4facfa5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -110,8 +110,6 @@ EOF while read dir commit; do check_git_hash "$dir" "$commit" done << EOF -llvm $LLVM_TAG -clang $CLANG_TAG mingw-w64-git $MINGW_TAG libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG @@ -130,7 +128,7 @@ uniuri $UNIURI_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" diff --git a/gitian/versions b/gitian/versions index cbc323e..cf07564 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,8 +23,6 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 -CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 @@ -55,7 +53,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 -CLANG_VER=r247539 +CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -79,6 +77,10 @@ OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz +CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz +LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz +LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -132,6 +134,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS +CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS +LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS +LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8a0e184..b677fd1 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,8 +23,6 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 -CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 @@ -58,7 +56,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 -CLANG_VER=r247539 +CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -82,6 +80,10 @@ OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz +CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz +LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz +LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -135,6 +137,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS +CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS +LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS +LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c7fb5bf..7a57980 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,8 +30,6 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 -CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master @@ -65,7 +63,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 -CLANG_VER=r247539 +CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -89,6 +87,10 @@ OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz +CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz +LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz +LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -142,6 +144,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS +CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS +LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS +LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_…

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 805173 - Enable HeapEnableTerminationOnCorruption for chrome processes on Windows. r=mhowell, tjr
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 49d21424d9d25b47a263bacec751742ac7370683 Author: Alex Gaynor <agaynor(a)mozilla.com> Date: Fri Mar 31 16:15:56 2017 -0400 Bug 805173 - Enable HeapEnableTerminationOnCorruption for chrome processes on Windows. r=mhowell,tjr This is an exploit mitigation which causes the Windows system allocator to abort in the event it is in a corrupted state, rather than attempt to proceed in a potentially exploitable state. Because we use jemalloc, this only affects system libraries or plugins which still use the system allocator. The has been enabled on our content processes for a while without incident. r=mhowell,tjr MozReview-Commit-ID: 5ctXugtbI1A --HG-- extra : rebase_source : f6f134404be3b258a8e522c22fa061c32a47e313 --- toolkit/xre/nsAppRunner.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 455b142..721f599 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4189,6 +4189,13 @@ XREMain::XRE_mainStartup(bool* aExitFlag) } #endif /* DEBUG */ +#if defined(XP_WIN) + // Enable the HeapEnableTerminationOnCorruption exploit mitigation. We ignore + // the return code because it always returns success, although it has no + // effect on Windows older than XP SP3. + HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); +#endif /* XP_WIN */ + #if defined(MOZ_WIDGET_GTK) || defined(MOZ_ENABLE_XREMOTE) // Stash DESKTOP_STARTUP_ID in malloc'ed memory because gtk_init will clear it. #define HAVE_DESKTOP_STARTUP_ID

1 0

[torbutton/master] Bug 21201: Mark Torbutton as multiprocess compatible
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 7c8c20ff3b4f6747d57c259407a55194ffb62374 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 4 10:08:06 2017 +0000 Bug 21201: Mark Torbutton as multiprocess compatible --- src/install.rdf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/install.rdf b/src/install.rdf index 3077598..5a698b3 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,6 +7,7 @@ <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> <em:version>1.9.7.1</em:version> + <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 21745: Fix handling of catch-all circuit
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 1324e306018779166674e9bc6101ddb9e2bbc68b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 17 12:16:36 2017 -0700 Bug 21745: Fix handling of catch-all circuit --- src/components/domain-isolator.js | 44 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a537429..e43ee58 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -6,7 +6,7 @@ // call earlier functions). The code file can be processed // with docco.js to provide clear documentation. -/* jshint moz: true */ +/* jshint esversion: 6 */ /* global Components, console, XPCOMUtils */ // ### Abbreviations @@ -91,19 +91,19 @@ tor.nonce = function() { // Convert the tag to a hex string. let tagStr = ""; - for (var i = 0; i < tag.length; i++) { + for (let i = 0; i < tag.length; i++) { tagStr += (tag[i] >>> 4).toString(16); tagStr += (tag[i] & 0x0F).toString(16); } return tagStr; -} +}; tor.newCircuitForDomain = function(domain) { // Re-generate the nonce for the domain. tor.noncesForDomains[domain] = tor.nonce(); logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); -} +}; // __tor.clearIsolation()_. // Clear the isolation state cache, forcing new circuits to be used for all @@ -115,7 +115,7 @@ tor.clearIsolation = function () { // Force a rotation on the next catch-all circuit use by setting the creation // time to the epoch. tor.unknownDirtySince = 0; -} +}; // __tor.isolateCircuitsByDomain()__. // For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates @@ -124,29 +124,27 @@ tor.clearIsolation = function () { // combination. tor.isolateCircuitsByDomain = function () { mozilla.registerProxyChannelFilter(function (aChannel, aProxy) { - if (!tor.isolationEnabled) + if (!tor.isolationEnabled) { return aProxy; - + } try { - let channel = aChannel.QueryInterface(Ci.nsIChannel); - firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain, + let channel = aChannel.QueryInterface(Ci.nsIChannel), proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), - replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); - logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " + - replacementProxy.username + ":" + replacementProxy.password); - return replacementProxy; - } catch (err) { - logger.eclog(3, err.message); - if (Date.now() - tor.unknownDirtySince > 1000*10*60) { - logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating."); - tor.newCircuitForDomain("--unknown--"); - tor.unknownDirtySince = Date.now(); + firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain; + if (firstPartyDomain === "") { + firstPartyDomain = "--unknown--"; + if (Date.now() - tor.unknownDirtySince > 1000*10*60) { + logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating."); + tor.newCircuitForDomain("--unknown--"); + tor.unknownDirtySince = Date.now(); + } } - let replacementProxy = tor.socksProxyCredentials(aProxy, "--unknown--"); - - logger.eclog(3, "tor SOCKS isolation catchall: " + aChannel.URI.spec + " via " + - replacementProxy.username + ":" + replacementProxy.password); + let replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); + logger.eclog(3, `tor SOCKS: ${channel.URI.spec} via + ${replacementProxy.username}:${replacementProxy.password}`); return replacementProxy; + } catch (e) { + logger.eclog(4, `tor domain isolator error: ${e.message}`); } }, 0); };

1 0

[torbutton/master] Bug 21747: 'New Tor Circuit for this Site' in ESR52
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit cfa9229fddb79067ebd3a0a6d8d0a10ab1bffc02 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 17 13:08:16 2017 -0700 Bug 21747: 'New Tor Circuit for this Site' in ESR52 Also, make sure we renew catchall "--unknown--" domain if user chooses "New Tor Circuit" for about:addons, for example. --- src/chrome/content/torbutton.js | 7 ++----- src/components/domain-isolator.js | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 970d2d0..9af7c57 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1014,11 +1014,8 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] - .getService(Ci.mozIThirdPartyUtil); - - let firstPartyDomain = thirdPartyUtil - .getFirstPartyHostForIsolation(gBrowser.currentURI); + let firstPartyDomain = gBrowser.contentPrincipal.originAttributes + .firstPartyDomain; let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index e43ee58..a52cccc 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -101,6 +101,9 @@ tor.nonce = function() { tor.newCircuitForDomain = function(domain) { // Re-generate the nonce for the domain. + if (domain === "") { + domain = "--unknown--"; + } tor.noncesForDomains[domain] = tor.nonce(); logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); };

1 0

[torbutton/master] Bug 21547: Fix circuit display under e10s
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 45184e903fd682f6eef5a44b6fa44df86a0dbc9f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Mar 5 23:50:15 2017 -0800 Bug 21547: Fix circuit display under e10s --- src/chrome/content/tor-circuit-display.js | 70 +++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 14e5e8e..b5c24f8 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -26,7 +26,7 @@ let createTorCircuitDisplay = (function () { "use strict"; // Mozilla utilities -const Cu = Components.utils; +const { Cu : utils , Ci : interfaces } = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); @@ -34,7 +34,7 @@ Cu.import("resource://gre/modules/Task.jsm"); let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -47,7 +47,10 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] let credentialsToNodeDataMap = {}, // A mutable map that reports `true` for IDs of "mature" circuits // (those that have conveyed a stream). - knownCircuitIDs = {}; + knownCircuitIDs = {}, + // A mutable map that records the SOCKS credentials for the + // latest channels for each browser. + browserToCredentialsMap = new Map(); // __trimQuotes(s)__. // Removes quotation marks around a quoted string. @@ -154,6 +157,42 @@ let collectIsolationData = function (aController, updateUI) { }).then(null, Cu.reportError)); }; +// __browserForChannel(channel)__. +// Returns the browser that loaded a given channel. +let browserForChannel = function (channel) { + if (!channel) return null; + let chan = channel.QueryInterface(Ci.nsIChannel); + let callbacks = chan.notificationCallbacks; + if (!callbacks) return null; + let loadContext; + try { + loadContext = callbacks.getInterface(Ci.nsILoadContext); + } catch (e) { + // Ignore + return null; + } + if (!loadContext) return null; + return loadContext.topFrameElement; +}; + +// __collectBrowserCredentials()__. +// Starts observing http channels. Each channel's proxyInfo +// username and password is recorded for the channel's browser. +let collectBrowserCredentials = function () { + return observe("http-on-modify-request", chan => { + try { + let proxyInfo = chan.QueryInterface(Ci.nsIProxiedChannel).proxyInfo; + let browser = browserForChannel(chan); + if (browser && proxyInfo) { + browserToCredentialsMap.set(browser, [proxyInfo.username, + proxyInfo.password]); + } + } catch (e) { + logger.eclog(3, `Error collecting browser credentials: ${e.message}, ${chan.URI.spec}`); + } + }); +}; + // ## User interface // __torbuttonBundle__. @@ -221,24 +260,6 @@ let nodeLines = function (nodeData) { return result; }; -// __getSOCKSCredentials(browser)__. -// Reads the SOCKS credentials for the corresponding browser object. -let getSOCKSCredentialsForBrowser = function (browser) { - if (browser === null) return null; - let docShell = browser.docShell; - if (docShell === null) return null; - let channel = docShell.currentDocumentChannel; - if (channel === null) return null; - if (channel instanceof Ci.nsIMultiPartChannel) { - channel = channel.baseChannel; - } - if (channel === null) return null; - if (!(channel instanceof Ci.nsIProxiedChannel)) return null; - let proxyInfo = channel.proxyInfo; - if (proxyInfo === null) return null; - return [proxyInfo.username, proxyInfo.password]; -}; - // __onionSiteRelayLine__. // When we have an onion site, we simply show the word '(relay)'. let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; @@ -249,7 +270,7 @@ let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; let updateCircuitDisplay = function () { let selectedBrowser = gBrowser.selectedBrowser; if (selectedBrowser) { - let credentials = getSOCKSCredentialsForBrowser(selectedBrowser), + let credentials = browserToCredentialsMap.get(selectedBrowser), nodeData = null; if (credentials) { let [SOCKS_username, SOCKS_password] = credentials; @@ -319,12 +340,16 @@ let syncDisplayWithSelectedTab = (function() { let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, + stopCollectingBrowserCredentials = null, stop = function() { syncDisplayWithSelectedTab(false); if (myController) { if (stopCollectingIsolationData) { stopCollectingIsolationData(); } + if (stopCollectingBrowserCredentials) { + stopCollectingBrowserCredentials(); + } myController = null; } }, @@ -340,6 +365,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { }); syncDisplayWithSelectedTab(true); stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); + stopCollectingBrowserCredentials = collectBrowserCredentials(); } }; try {

1 0

[torbutton/master] Bug 21268: e10s compatibility for New Identity.
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 7c712a4ecbd1951503532c0e1f323ab6f0eaa4b3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 8 11:37:06 2017 -0500 Bug 21268: e10s compatibility for New Identity. Ignore "not available" errors from appCacheStorage.asyncEvictStorage() since these can occur if the cache has not been used yet. Change torbutton_close_tabs_on_new_identity() to use browser.removeTab() instead of browser.contentWindow.close() since we cannot directly access the contentWindow when multi-process mode is enabled. Fix indentation and modernize the torbutton_close_tabs_on_new_identity() code. --- src/chrome/content/torbutton.js | 92 ++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 43 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index abf533f..970d2d0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1219,7 +1219,12 @@ function torbutton_do_new_identity() { // then we are using the new cache (cache2) which operates synchronously. // If we are using the old cache, then the tor-browser.git patch for // #5715 also makes this synchronous. So we pass a null callback. - appCacheStorage.asyncEvictStorage(null); + try { + appCacheStorage.asyncEvictStorage(null); + } catch (err if err.name == 'NS_ERROR_NOT_AVAILABLE') { + // We ignore "not available" errors because they occur if a cache + // has not been used, e.g., if no browsing has been done. + } } } catch(e) { torbutton_log(5, "Exception on cache clearing: "+e); @@ -1758,56 +1763,57 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.savePrefFile(null); } +// This function closes all XUL browser windows except this one. For this +// window, it closes all existing tabs and creates one about:blank tab. function torbutton_close_tabs_on_new_identity() { - var close_newnym = m_tb_prefs.getBoolPref("extensions.torbutton.close_newnym"); - if (!close_newnym) { - torbutton_log(3, "Not closing tabs"); - return; - } - - // TODO: muck around with browser.tabs.warnOnClose.. maybe.. - torbutton_log(3, "Closing tabs..."); - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var enumerator = wm.getEnumerator("navigator:browser"); - var closeWins = new Array(); - while(enumerator.hasMoreElements()) { - var win = enumerator.getNext(); - var browser = win.getBrowser(); - if(!browser) { - torbutton_log(5, "No browser for possible closed window"); - continue; - } - var tabs = browser.browsers.length; - - torbutton_log(3, "Length: "+browser.browsers.length); + if (!m_tb_prefs.getBoolPref("extensions.torbutton.close_newnym")) { + torbutton_log(3, "Not closing tabs"); + return; + } - var remove = new Array(); - for(var i = 0; i < tabs; i++) { - remove.push(browser.browsers[i]); - } + // TODO: muck around with browser.tabs.warnOnClose.. maybe.. + torbutton_log(3, "Closing tabs..."); + let wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Ci.nsIWindowMediator); + let enumerator = wm.getEnumerator("navigator:browser"); + let windowsToClose = new Array(); + while (enumerator.hasMoreElements()) { + let win = enumerator.getNext(); + let browser = win.getBrowser(); + if (!browser) { + torbutton_log(5, "No browser for possible closed window"); + continue; + } - if(browser.browsers.length == remove.length) { - // It is a bad idea to alter the window list while - // iterating over it. - browser.addTab("about:blank"); - if(win != window) { - closeWins.push(win); - } - } + let tabCount = browser.browsers.length; + torbutton_log(3, "Tab count for window: " + tabCount); + let tabsToRemove = new Array(); + for (let i = 0; i < tabCount; i++) { + let tab = browser.getTabForBrowser(browser.browsers[i]); + if (!tab) { + torbutton_log(5, "No tab for browser"); + } else { + tabsToRemove.push(tab); + } + } - for(var i = 0; i < remove.length; i++) { - remove[i].contentWindow.close(); - } + if (win == window) { + browser.addTab("about:blank"); + } else { + // It is a bad idea to alter the window list while iterating + // over it, so add this window to an array and close it later. + windowsToClose.push(win); } - torbutton_log(2, "Closing windows..."); + // Close each tab except the new blank one that we created. + tabsToRemove.forEach(aTab => browser.removeTab(aTab)); + } - for(var i = 0; i < closeWins.length; ++i) { - closeWins[i].close(); - } + // Close all XUL windows except this one. + torbutton_log(2, "Closing windows..."); + windowsToClose.forEach(aWin => aWin.close()); - torbutton_log(3, "Closed all tabs"); + torbutton_log(3, "Closed all tabs"); } // Bug 1506 P2: This code is only important for disabling

1 0

[torbutton/master] fixup! Bug 21267: Remove 14429 implementation for now
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit eadfd9622fc7a15aad5200e11a35a4f558ae5743 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 4 08:59:06 2017 +0000 fixup! Bug 21267: Remove 14429 implementation for now --- src/defaults/preferences/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 68772a5..f61cb89 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -25,7 +25,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 0); +pref("extensions.torbutton.maximize_warnings_remaining", 3); // Security prefs: pref("extensions.torbutton.cookie_protections",true);

1 0

[torbutton/master] Bug 21201: Avoid accessing contentWindow inside torbutton_resizelistener.
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 0f9c8fc79b9e0c3411c2aedf18ad24b4596172a0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 9 11:37:20 2017 -0500 Bug 21201: Avoid accessing contentWindow inside torbutton_resizelistener. Also, use Cc, Ci, and Cr inside torbutton_resizelistener. --- src/chrome/content/torbutton.js | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 44f01f9..f521a6c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2204,26 +2204,16 @@ var torbutton_resizelistener = { QueryInterface: function(aIID) { - if (aIID.equals(Components.interfaces.nsIWebProgressListener) || - aIID.equals(Components.interfaces.nsISupportsWeakReference) || - aIID.equals(Components.interfaces.nsISupports)) + if (aIID.equals(Ci.nsIWebProgressListener) || + aIID.equals(Ci.nsISupportsWeakReference) || + aIID.equals(Ci.nsISupports)) return this; - throw Components.results.NS_NOINTERFACE; + throw Cr.NS_NOINTERFACE; }, onLocationChange: function(aProgress, aRequest, aURI) {}, onStateChange: function(aProgress, aRequest, aFlag, aStatus) { - if (aFlag & Components.interfaces.nsIWebProgressListener.STATE_STOP) { - var progress = - Components.classes["@mozilla.org/docloaderservice;1"]. - getService(Components.interfaces.nsIWebProgress); - var win = getBrowser().contentWindow; - if (!win || typeof(win) == "undefined") { - torbutton_log(5, "No initial browser content window?"); - progress.removeProgressListener(this); - return; - } - + if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { m_tb_resize_handler = function() { if (window.windowState === 1) { if (m_tb_prefs. @@ -2301,6 +2291,8 @@ var torbutton_resizelistener = // event got fired. Thus, we have the rather klunky setTimeout() call. window.addEventListener("sizemodechange", m_tb_resize_handler, false); + let progress = Cc["@mozilla.org/docloaderservice;1"] + .getService(Ci.nsIWebProgress); progress.removeProgressListener(this); } }, // onStateChange

1 0

[torbutton/master] Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 7fffae283aaf12d745b64a95a57ee4d8c9d05457 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Jan 22 22:03:34 2017 -0800 Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes --- src/components/domain-isolator.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index dbdca1b..a537429 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -29,11 +29,6 @@ let mozilla = {}; mozilla.protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1"] .getService(Ci.nsIProtocolProxyService); -// __mozilla.thirdPartyUtil__. -// Mozilla's Thirdy Party Utilities, for figuring out first party domain. -mozilla.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] - .getService(Ci.mozIThirdPartyUtil); - // __mozilla.registerProxyChannelFilter(filterFunction, positionIndex)__. // Registers a proxy channel filter with the Mozilla Protocol Proxy Service, // which will help to decide the proxy to be used for a given channel. @@ -133,11 +128,8 @@ tor.isolateCircuitsByDomain = function () { return aProxy; try { - let channel = aChannel.QueryInterface(Ci.nsIChannel), - firstPartyURI = mozilla.thirdPartyUtil.getFirstPartyURIFromChannel(channel, true) - .QueryInterface(Ci.nsIURI), - firstPartyDomain = mozilla.thirdPartyUtil - .getFirstPartyHostForIsolation(firstPartyURI), + let channel = aChannel.QueryInterface(Ci.nsIChannel); + firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain, proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " +

1 0

[torbutton/master] Bug 21201.1: Use new svg.disabled pref
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 1b7ce9f53f6a27e8684fdcda0b3be086a914d054 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jan 11 09:21:26 2017 -0800 Bug 21201.1: Use new svg.disabled pref --- src/modules/security-prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index 4a39ca8..f508b87 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -29,7 +29,7 @@ const kSecuritySettings = { "noscript.global" : [, false, false, false, true ], "noscript.globalHttpsWhitelist" : [, false, true, true, false], "noscript.forbidFonts" : [, true, false, false, false], - "svg.in-content.enabled" : [, false, true, true, true ], + "svg.disabled" : [, true, false, false, false], }; // The Security Settings prefs in question.

1 0

[torbutton/master] Bug 21267: Remove 14429 implementation for now
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 9b5a66ce7821c0cb7f6fd2fb24e7e15e81a27c51 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Mar 11 16:05:00 2017 -0800 Bug 21267: Remove 14429 implementation for now --- src/chrome/content/content-sizer.js | 514 -------------------------------- src/chrome/content/torbutton.js | 2 - src/defaults/preferences/preferences.js | 1 - 3 files changed, 517 deletions(-) diff --git a/src/chrome/content/content-sizer.js b/src/chrome/content/content-sizer.js deleted file mode 100644 index bd657b8..0000000 --- a/src/chrome/content/content-sizer.js +++ /dev/null @@ -1,514 +0,0 @@ -// The purpose of this file is to ensure that window.innerWidth and window.innerHeight -// always return rounded values. - -// This file is formatted for docco.js. Later functions call earlier ones. - -/* -TODO: -* Decide on quantization amount. 100x100? 200x100? Maybe gradually increase, like 50, 100, 150, 200, 300, 500, 600, 800, etc.? -* Understand gBrowser.contentWindow.document.body.getBoundingClientRect(). Does this leak some fingerprintable information? -* Modify Tor Browser C++ code to allow precise setting of zoom? (Would allow more precise fit of content height in window.) -*/ - -/* jshint esnext: true */ - -// __quantizeBrowserSize(window, xStep, yStep)__. -// Ensures that gBrowser width and height are multiples of -// xStep and yStep. -let quantizeBrowserSize = function (window, xStep, yStep) { -"use strict"; - -// __currentDefaultZoom__. -// The settings of gBrowser.fullZoom used to quantize the content window dimensions, -// except if the user has pressed zoom+ or zoom-. Stateful. -let currentDefaultZoom = 1; - -// ## Utilities - -// Mozilla abbreviations. -let {classes: Cc, interfaces: Ci, results: Cr, Constructor: CC, utils: Cu } = Components; - -// Use Task.jsm to avoid callback hell. -Cu.import("resource://gre/modules/Task.jsm"); - -// Make the TorButton logger available. -let logger = Cc["@torproject.org/torbutton-logger;1"] - .getService(Ci.nsISupports).wrappedJSObject; - -// __torbuttonBundle__. -// Bundle of localized strings for torbutton UI. -let torbuttonBundle = Services.strings.createBundle( - "chrome://torbutton/locale/torbutton.properties"); - -// Import utility functions -let { bindPrefAndInit, getEnv, observe } = - Cu.import("resource://torbutton/modules/utils.js", {}); - -// __windowUtils(window)__. -// See nsIDOMWindowUtils on MDN. -let windowUtils = window => window.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils); - -// __isNumber(value)__. -// Returns true iff the value is a number. -let isNumber = x => typeof x === "number"; - -// __sortBy(array, scoreFn)__. -// Returns a copy of the array, sorted from least to best -// according to scoreFn. -let sortBy = function (array, scoreFn) { - let compareFn = (a, b) => scoreFn(a) - scoreFn(b); - return array.slice().sort(compareFn); -}; - -// __isMac__. -// Constant, set to true if we are using a Mac (Darwin). -let isMac = Services.appinfo.OS === "Darwin"; - -// __isWindows__. -// Constant, set to true if we are using Windows. -let isWindows = Services.appinfo.OS === "WINNT"; - -// __isTilingWindowManager__. -// Constant, set to true if we are using a (known) tiling window -// manager in linux. -let isTilingWindowManager = (function () { - if (isMac || isWindows) return false; - let gdmSession = getEnv("GDMSESSION"); - if (!gdmSession) return false; - let gdmSessionLower = gdmSession.toLowerCase(); - return ["9wm", "alopex", "awesome", "bspwm", "catwm", "dswm", "dwm", - "echinus", "euclid-wm", "frankenwm", "herbstluftwm", "i3", - "i3wm", "ion", "larswm", "monsterwm", "musca", "notion", - "qtile", "ratpoison", "snapwm", "spectrwm", "stumpwm", - "subtle", "tinywm", "ttwm", "wingo", "wmfs", "wmii", "xmonad"] - .filter(x => x.startsWith(gdmSessionLower)).length > 0; -})(); - -// __largestMultipleLessThan(factor, max)__. -// Returns the largest number that is a multiple of factor -// and is less or equal to max. -let largestMultipleLessThan = function (factor, max) { - return Math.max(1, Math.floor(max / factor, 1)) * factor; -}; - -// ## Task.jsm helper functions - -// __sleep(timeMs)__. -// Returns a Promise that sleeps for the specified time interval, -// and returns an Event object of type "wake". -let sleep = function (timeMs) { - return new Promise(function (resolve, reject) { - window.setTimeout(function () { - resolve(new Event("wake")); - }, timeMs); - }); -}; - -// __listen(target, eventType, useCapture, timeoutMs)__. -// Listens for a single event of eventType on target. -// Returns a Promise that resolves to an Event object, if the event fires. -// If a timeout occurs, then Promise is rejected with a "Timed out" error. -let listen = function (target, eventType, useCapture, timeoutMs) { - return new Promise(function (resolve, reject) { - let listenFunction = function (event) { - target.removeEventListener(eventType, listenFunction, useCapture); - resolve(event); - }; - target.addEventListener(eventType, listenFunction, useCapture); - if (timeoutMs !== undefined && timeoutMs !== null) { - window.setTimeout(function () { - target.removeEventListener(eventType, listenFunction, useCapture); - resolve(new Event("timeout")); - }, timeoutMs); - } - }); -}; - -// __listenForTrueResize(window, timeoutMs)__. -// Task.jsm function. Call `yield listenForTrueResize(window)` to -// wait until the window changes its outer dimensions. Ignores -// resize events where window dimensions are unchanged. Returns -// the resize event object. -let listenForTrueResize = function* (window, timeoutMs) { - let [originalWidth, originalHeight] = [window.outerWidth, window.outerHeight], - event, - finishTime = timeoutMs ? Date.now() + timeoutMs : null; - do { - event = yield listen(window, "resize", true, - finishTime ? finishTime - Date.now() : undefined); - } while (event.type === "resize" && - originalWidth === window.outerWidth && - originalHeight === window.outerHeight); - return event; -}; - -// ## Window state queries - -// __trueZoom(window)__. -// Returns the true magnification of the content in the window -// object. (In contrast, the `gBrowser.fullZoom` value is only approximated -// by the display zoom.) -let trueZoom = window => windowUtils(window).screenPixelsPerCSSPixel; - -// __systemZoom__. -// On Windows, if the user sets the DPI to be 125% or 150% (instead of 100%), -// then we get an overall zoom that needs to be accounted for. -let systemZoom = trueZoom(window); - -// __canBeResized(window)__. -// Returns true iff the window is in a state that can -// be resized. Namely, not fullscreen, not maximized, -// and not running in a tiling window manager. -let canBeResized = function (window) { - // Note that window.fullScreen and (window.windowState === window.STATE_FULLSCREEN) - // sometimes disagree, so we only allow resizing when both are false. - return !isTilingWindowManager && - !window.fullScreen && - window.windowState === window.STATE_NORMAL; -}; - -// __isDocked(window)__. -// On Windows and some linux desktops, you can "dock" a window -// at the right or left, so that it is maximized only in height. -// Returns true in this case. (Note we use mozInnerScreenY instead -// of screenY to take into account title bar space sometimes left -// out of outerHeight in certain desktop environments.) -let isDocked = window => ((window.mozInnerScreenY + window.outerHeight) >= - (window.screen.availTop + window.screen.availHeight) && - (window.screenY <= window.screen.availTop)); - -// ## Window appearance - -// __marginToolTip__. -// A constant. The tooltip string shown in the margin. -let marginToolTip = torbuttonBundle.GetStringFromName("torbutton.content_sizer.margin_tooltip"); - -// __updateContainerAppearance(container, on)__. -// Get the color and position of margins correct. -let updateContainerAppearance = function (container, on) { - // Align the browser at top left, so any gray margin will be visible - // at right and bottom. Except in fullscreen, where we have black - // margins and gBrowser in top center, and when using a tiling - // window manager, when we have gray margins and gBrowser in top - // center. - container.align = on ? - (canBeResized(window) ? "start" : "center") - : ""; - container.pack = on ? "start" : ""; - container.tooltipText = on ? marginToolTip : ""; -}; - -// __updateBackground(window)__. -// Sets the margin background to black or dim gray, depending on -// whether the window is full screen. -let updateBackground = function (window) { - window.gBrowser.parentElement.style - .backgroundColor = window.fullScreen ? "Black" : "LightGray"; -}; - -// ## Window Zooming - -// __computeTargetZoom(parentWidth, parentHeight, xStep, yStep, fillHeight)__. -// Given a parent width and height for gBrowser's container, returns the -// desired zoom for the content window. -let computeTargetZoom = function (parentWidth, parentHeight, xStep, yStep, fillHeight) { - if (fillHeight) { - // Return the estimated zoom need to fill the height of the browser. - let h = largestMultipleLessThan(yStep, parentHeight); - return parentHeight / h; - } else { - // Here we attempt to find a zoom with the best fit for the window size that will - // provide a content window with appropriately quantized dimensions. - let w = largestMultipleLessThan(xStep, parentWidth), - h = largestMultipleLessThan(yStep, parentHeight), - parentAspectRatio = parentWidth / parentHeight, - possibilities = [[w, h], - [Math.min(w, w - xStep), h], - [w, Math.min(h - yStep)]], - // Find the [w, h] pair with the closest aspect ratio to the parent window. - score = ([w, h]) => Math.abs(Math.log(w / h / parentAspectRatio)), - [W, H] = sortBy(possibilities, score)[0]; - // Return the estimated zoom. - return Math.min(parentHeight / H, parentWidth / W); - } -}; - -// __updateDimensions(window, xStep, yStep)__. -// Changes the width and height of the gBrowser XUL element to be a multiple of x/yStep. -let updateDimensions = function (window, xStep, yStep) { - // Don't run if window is minimized. - if (window.windowState === window.STATE_MINIMIZED) return; - let gBrowser = window.gBrowser, - container = gBrowser.parentElement; - updateContainerAppearance(container, true); - let parentWidth = container.clientWidth, - parentHeight = container.clientHeight, - longPage = !gBrowser.contentWindow.fullScreen, - targetZoom = (canBeResized(window) && !isDocked(window)) ? - 1 : computeTargetZoom(parentWidth, - parentHeight, xStep, yStep, longPage), - zoomOffset = 1; - for (let i = 0; i < 8; ++i) { - // We set `gBrowser.fullZoom` to 99% of the needed zoom, unless - // it's `1`. That's because the "true zoom" is sometimes larger - // than fullZoom, and we need to ensure the gBrowser width and - // height do not exceed the container size. - gBrowser.fullZoom = (targetZoom === 1 ? 1 : 0.99) * targetZoom * zoomOffset; - currentDefaultZoom = gBrowser.fullZoom; - let zoom = trueZoom(gBrowser.contentWindow) / systemZoom, - targetContentWidth = largestMultipleLessThan(xStep, parentWidth / zoom), - targetContentHeight = largestMultipleLessThan(yStep, parentHeight / zoom), - targetBrowserWidth = Math.round(targetContentWidth * zoom), - targetBrowserHeight = Math.round(targetContentHeight * zoom); - // Because gBrowser is inside a vbox, width and height behave differently. It turns - // out we need to set `gBrowser.width` and `gBrowser.maxHeight`. - gBrowser.width = targetBrowserWidth; - gBrowser.maxHeight = targetBrowserHeight; - // When using Windows DPI != 100%, we can get rounding errors. We'll need - // to try again if we failed to get rounded content width x height. - // Unfortunately, this is not detectable if search bar or dev console is open. - if ((// Some weird sidebar is open, or - gBrowser.clientWidth !== gBrowser.selectedBrowser.clientWidth || - // content width is correct. - gBrowser.contentWindow.innerWidth === targetContentWidth) && - (// Search bar or dev console is open, or - gBrowser.clientHeight !== gBrowser.selectedBrowser.clientHeight || - // content height is correct. - gBrowser.contentWindow.innerHeight === targetContentHeight)) { - logger.eclog(3, - " chromeWin " + window.outerWidth + "x" + window.outerHeight + - " container " + parentWidth + "x" + parentHeight + - " gBrowser.fullZoom " + gBrowser.fullZoom + "X" + - " targetContent " + targetContentWidth + "x" + targetContentHeight + - " zoom " + zoom + "X" + - " targetBrowser " + targetBrowserWidth + "x" + targetBrowserHeight + - " gBrowser " + gBrowser.clientWidth + "x" + gBrowser.clientHeight + - " content " + gBrowser.contentWindow.innerWidth + "x" + gBrowser.contentWindow.innerHeight); - break; - } - zoomOffset *= 1.02; - } -}; - -// __resetZoomOnDomainChanges(gBrowser, on)__. -// If `on` is true, then every time a tab location changes -// to a new domain, the tab's zoom level is set back to the -// "default zoom" level. -let resetZoomOnDomainChanges = (function () { - let tabToDomainMap = new Map(), - onLocationChange = function (browser) { - let lastHost = tabToDomainMap.get(browser), - currentHost = browser && - browser.currentURI && - browser.currentURI.asciiHost; - if (lastHost !== currentHost) { - browser.fullZoom = currentDefaultZoom; - // Record the tab's current domain, so that we - // can see when it changes. - tabToDomainMap.set(browser, currentHost); - } - }, - listener = { onLocationChange : onLocationChange }; - return function (gBrowser, on) { - if (on) { - gBrowser.addTabsProgressListener(listener); - } else { - gBrowser.removeTabsProgressListener(listener); - } - }; -})(); - -// ## Window Resizing - -// __reshape(window, {left, top, width, height}, timeoutMs)__. -// Reshapes the window to rectangle {left, top, width, height} and yields -// until the window reaches its target size, or the timeout occurs. -let reshape = function* (window, {left, top, width, height}, timeoutMs) { - let finishTime = Date.now() + timeoutMs, - x = isNumber(left) ? left : window.screenX, - y = isNumber(top) ? top : window.screenY, - w = isNumber(width) ? width : window.outerWidth, - h = isNumber(height) ? height : window.outerHeight; - // Make sure we are in a new event. - yield sleep(0); - // Sometimes we get a race condition in linux when maximizing, - // so check again at the last minute that resizing is allowed. - if (!canBeResized(window)) return; - if (w !== window.outerWidth || h !== window.outerHeight) { - window.resizeTo(w, h); - } - if (x !== window.screenX || y !== window.screenY) { - window.moveTo(x, y); - } - // Yield until we have the correct screen position and size, or - // we timeout. Multiple resize events often fire in a resize. - while (x !== window.screenX || - y !== window.screenY || - w !== window.outerWidth || - h !== window.outerHeight) { - let timeLeft = finishTime - Date.now(); - if (timeLeft <= 0) break; - yield listenForTrueResize(window, timeLeft); - } -}; - -// __gaps(window)__. -// Deltas between gBrowser and its container. Returns null if there is no gap. -let gaps = function (window) { - let gBrowser = window.gBrowser, - container = gBrowser.parentElement, - deltaWidth = Math.max(0, container.clientWidth - gBrowser.clientWidth), - deltaHeight = Math.max(0, container.clientHeight - gBrowser.clientHeight); - return (deltaWidth === 0 && deltaHeight === 0) ? null - : { deltaWidth : deltaWidth, deltaHeight : deltaHeight }; -}; - -// __shrinkwrap(window)__. -// Shrinks the window so that it encloses the gBrowser with no gaps. -let shrinkwrap = function* (window) { - // Figure out what size change we need. - let currentGaps = gaps(window), - screenRightEdge = window.screen.availWidth + window.screen.availLeft, - windowRightEdge = window.screenX + window.outerWidth; - if (currentGaps) { - // Now resize to close the gaps. - yield reshape(window, - {width : (window.outerWidth - currentGaps.deltaWidth), - // Shrink in height only if we are not docked. - height : !isDocked(window) ? - (window.outerHeight - - currentGaps.deltaHeight) : null, - left : (isDocked(window) && - (windowRightEdge >= screenRightEdge)) ? - (window.screenX + currentGaps.deltaWidth) - : null }, - 500); - } -}; - -// __rebuild(window)__. -// Jog the size of the window slightly, to remind the window manager -// to redraw the window. -let rebuild = function* (window) { - let h = window.outerHeight; - yield reshape(window, {height : (h + 1)}, 300); - yield reshape(window, {height : h}, 300); -}; - -// __fixWindow(window)__. -// An async function for Task.jsm. Makes sure the window looks okay -// given the quantized browser element. -let fixWindow = function* (window) { - if (canBeResized(window)) { - yield shrinkwrap(window); - if (!isMac && !isWindows) { - // Unfortunately, on some linux desktops, - // the window resize fails if the user is still holding on - // to the drag-resize handle. Even more unfortunately, the - // only way to know that the user if finished dragging - // if we detect the mouse cursor inside the window or the - // user presses a key. - // So, after the first mousemove, or keydown event occurs, we - // rebuild the window. - let event = yield Promise.race( - [listen(window, "mousemove", true), - listen(window, "keydown", true), - listen(window, "resize", true)]); - if (event !== "resize") { - yield rebuild(window); - } - return event; - } - } -}; - -// __autoresize(window, stepMs)__. -// Automatically resize the gBrowser, and then shrink the window -// if the user has attempted to resize it. -let autoresize = function (window, stepMs, xStep, yStep) { - let stop = false; - Task.spawn(function* () { - // Fix the content dimensions once at startup, and - // keep updating the dimensions whenever the user resizes - // the window. - while (!stop) { - updateDimensions(window, xStep, yStep); - let event = yield fixWindow(window); - // Do nothing until the user starts to resize window. - if ((!event || event.type !== "resize") && !stop) { - event = yield listenForTrueResize(window); - } - if (!isTilingWindowManager) { - while (event.type !== "timeout" && !stop) { - if (!stop) { - updateDimensions(window, xStep, yStep); - event = yield listenForTrueResize(window, stepMs); - } - } - } - // The user has likely released the mouse cursor on the window's - // drag/resize handle, so loop and call fixWindow. - } - }); - return () => { stop = true; }; -}; - -// ## Main Function - -// __quantizeBrowserSizeMain(window, xStep, yStep)__. -// Ensures that gBrowser width and height are multiples of xStep and yStep, and always as -// large as possible inside the chrome window. -let quantizeBrowserSizeMain = function (window, xStep, yStep) { - let gBrowser = window.gBrowser, - container = window.gBrowser.parentElement, - fullscreenHandler = function () { - // Use setTimeout to make sure we only update dimensions after - // full screen mode is fully established. - window.setTimeout(function () { - updateDimensions(window, xStep, yStep); - updateBackground(window); - }, 0); - }, - originalMinWidth = container.minWidth, - originalMinHeight = container.minHeight, - stopAutoresizing, - activate = function (on) { - console.log("activate:", on); - // Don't let the browser shrink below a single xStep x yStep size. - container.minWidth = on ? xStep : originalMinWidth; - container.minHeight = on ? yStep : originalMinHeight; - updateContainerAppearance(container, on); - updateBackground(window); - resetZoomOnDomainChanges(gBrowser, on); - if (on) { - shrinkwrap(window); - window.addEventListener("sizemodechange", fullscreenHandler, false); - stopAutoresizing = autoresize(window, - (isMac || isWindows) ? 250 : 500, - xStep, yStep); - console.log("activated"); - } else { - if (stopAutoresizing) stopAutoresizing(); - // Ignore future resize events. - window.removeEventListener("sizemodechange", fullscreenHandler, false); - // Let gBrowser expand with its parent vbox. - gBrowser.width = ""; - gBrowser.maxHeight = ""; - console.log("deactivated"); - } - }; - let unbind = bindPrefAndInit("extensions.torbutton.resize_windows", activate); - window.addEventListener("unload", unbind, true); -}; - -// Only start quantizing once the window has become visible. -var stopObserving = observe("xul-window-visible", function () { - if (Services.wm.getMostRecentWindow("navigator:browser") === window) { - quantizeBrowserSizeMain(window, xStep, yStep); - stopObserving(); - } -}); - -// end of quantizeBrowserSize definition -}; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f521a6c..abf533f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -402,8 +402,6 @@ function torbutton_init() { m_tb_control_port, m_tb_control_pass, "extensions.torbutton.display_circuit"); - quantizeBrowserSize(window, 100, 100); - torbutton_init_user_manual_links(); torbutton_log(3, 'init completed'); diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index b9ba458..68772a5 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -34,7 +34,6 @@ pref("extensions.torbutton.spoof_english",true); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.resize_windows",true); pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false);

1 0

[tor-browser-bundle/hardened-builds] Build gn in linux-webrtc.
by gk＠torproject.org 31 Mar '17

31 Mar '17

commit 45f6ab2698d447441095e8d388fba3a3aa855f57 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 23 13:14:07 2016 -0700 Build gn in linux-webrtc. There is a prebuilt gn binary for linux64, but none for linux32, and anyway we prefer to build from source for reproducibility reasons. --- gitian/descriptors/linux/gitian-webrtc.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gitian/descriptors/linux/gitian-webrtc.yml b/gitian/descriptors/linux/gitian-webrtc.yml index f18da52..85da679 100644 --- a/gitian/descriptors/linux/gitian-webrtc.yml +++ b/gitian/descriptors/linux/gitian-webrtc.yml @@ -63,6 +63,8 @@ script: | ln -sf hardened-cc c++ cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + # GN needs libatomic.so.1 here. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib ARCH="" if [ $GBUILD_BITS == "64" ]; then @@ -80,6 +82,15 @@ script: | # Building webrtc tar xaf webrtc.tar.gz cd webrtc/src + + # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. + cd tools/gn + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean + cd ../.. + # This is where bootstrap.py stashes the built gn. + GN="$PWD/out_bootstrap/gn" + export GYP_CROSSCOMPILE=1 export GYP_DEFINES="OS=linux target_arch=$(if [ $GBUILD_BITS = 32 ]; then echo ia32; else echo x64; fi)" # Do not use bundled utilities.

1 0