February 2017 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 21326: Update the "Using a system-installed Tor" section.
by boklm＠torproject.org 09 Feb '17

09 Feb '17

commit 176897d72a0bf89008648d865e1bf4f2b8909fda Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 14:06:44 2017 -0500 Bug 21326: Update the "Using a system-installed Tor" section. Adjust the comments to account for recent Torbutton changes. --- projects/tor-browser/RelativeLink/start-tor-browser | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index f556389..a78b367 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -3,7 +3,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# Copyright 2015 The Tor Project. See LICENSE for licensing information. +# Copyright 2017 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -316,17 +316,13 @@ EOF # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> +# network.security.ports.banned [...],<SocksPort>,<ControlPort> +# network.proxy.socks 127.0.0.1 +# network.proxy.socks_port <SocksPort> # extensions.torbutton.inserted_button true # extensions.torbutton.launch_warning false # extensions.torbutton.loglevel 2 # extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0

[tor-browser-build/master] Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge.
by boklm＠torproject.org 09 Feb '17

09 Feb '17

commit d3fc9ca42b27291e3a03ca8baca6f73547105800 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge. https://lists.torproject.org/pipermail/tor-project/2017-January/000906.html --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index bd92585..c56d316 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,6 +37,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3");

1 0

[tor-browser-build/master] Add option to sign the sha256sums-unsigned-build.txt file
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit c0242adc7a6a414bb183a3f07dddd64b7e3a51bc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 19:23:44 2017 +0100 Add option to sign the sha256sums-unsigned-build.txt file --- README | 9 +++++++++ projects/release/config | 3 +++ 2 files changed, 12 insertions(+) diff --git a/README b/README index 0b8e510..2c36d74 100644 --- a/README +++ b/README @@ -149,6 +149,15 @@ the build files in the tor-browser-builds/ directory (unless you changed the publish_dir option). +Signing builds +-------------- + +If the environment variable RBM_SIGN_BUILD is set to 1, the +sha256sums-unsigned-build.txt file will be signed with gpg. +You can use the RBM_GPG_OPTS environment variable to add some options +to the gpg command used to sign the file. + + Cleaning obsolete files and containers images --------------------------------------------- diff --git a/projects/release/config b/projects/release/config index 09b4c0e..daa78dd 100644 --- a/projects/release/config +++ b/projects/release/config @@ -125,4 +125,7 @@ build: | [% END -%] cd "$destdir" sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt + [% IF ENV.RBM_SIGN_BUILD -%] + gpg -abs [% ENV.RBM_GPG_OPTS %] sha256sums-unsigned-build.txt + [% END -%] cat sha256sums-unsigned-build.txt

1 0

[tor-browser-build/master] Include *.zip files in sha256sums-unsigned-build.txt
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit 444f6e2210d62b5fd6ab8c204a1c93594bf37ec4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 14:04:06 2017 +0100 Include *.zip files in sha256sums-unsigned-build.txt --- projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/config b/projects/release/config index 527e269..09b4c0e 100644 --- a/projects/release/config +++ b/projects/release/config @@ -124,5 +124,5 @@ build: | mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt + sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt cat sha256sums-unsigned-build.txt

1 0

[tor-browser-bundle/master] Bug 21402: verify sandbox git tag's gpg signature
by gk＠torproject.org 06 Feb '17

06 Feb '17

commit 917d38c1d58c8cb11ff5b016054d2589d313882e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 13:43:44 2017 +0100 Bug 21402: verify sandbox git tag's gpg signature --- gitian/verify-tags.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index e8dfe3f..4b17550 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -104,6 +104,7 @@ meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG cmake cmake.gpg $CMAKE_TAG +sandbox obfs4proxy.gpg $SANDBOX_TAG EOF while read dir commit; do

1 0

[tor-browser-build/master] Add linux sandbox
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit 918acde2b07acc72313ed8f69f0fd4a2622d772a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 13:58:21 2017 +0100 Add linux sandbox --- projects/go/config | 9 ++++++++- projects/goerrors/config | 16 ++++++++++++++++ projects/gogb/config | 22 ++++++++++++++++++++++ projects/gogb/gb-build-dir.patch | 31 +++++++++++++++++++++++++++++++ projects/release/config | 8 ++++++++ projects/sandbox/build | 27 +++++++++++++++++++++++++++ projects/sandbox/config | 29 +++++++++++++++++++++++++++++ 7 files changed, 141 insertions(+), 1 deletion(-) diff --git a/projects/go/config b/projects/go/config index a5920f5..9341f98 100644 --- a/projects/go/config +++ b/projects/go/config @@ -12,7 +12,7 @@ var: export GOOS=[% c("var/GOOS") %] export GOARCH=[% c("var/GOARCH") %] export GOPATH=/var/tmp/dist/gopath - export PATH=/var/tmp/dist/go/bin:"$PATH" + export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" # Template build script for building a go library. # This can be called as projects/go/var/build_go_lib. @@ -26,9 +26,16 @@ var: distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + [% FOREACH dep = c("var/go_lib_deps") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/' _ dep) %] + [% END -%] mkdir -p $(dirname "$GOPATH/src/[% c("var/go_lib") %]") mv /var/tmp/build/[% project %]-[% c('version') %] "$GOPATH/src/[% c("var/go_lib") %]" cd "$GOPATH/src/[% c("var/go_lib") %]" + for p in $(ls -1 $rootdir/*.patch 2> /dev/null | sort) + do + patch -p1 < $p + done [% IF c("var/go_lib_install") -%] [% FOREACH inst IN c("var/go_lib_install") %] go install [% inst %] diff --git a/projects/goerrors/config b/projects/goerrors/config new file mode 100644 index 0000000..4451f7b --- /dev/null +++ b/projects/goerrors/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pkg/errors +git_hash: 248dadf4e9068a0b3e79f02ed0a610d935de5302 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/pkg/errors + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/gogb/config b/projects/gogb/config new file mode 100644 index 0000000..a358819 --- /dev/null +++ b/projects/gogb/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/constabulary/gb +git_hash: 06cc925cce6592e922dcc4839a8b44feb384e71e +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/constabulary/gb + go_lib_install: github.com/constabulary/gb/cmd/gb + go_lib_deps: + - goerrors + +input_files: + - project: docker-image + - name: go + project: go + - name: goerrors + project: goerrors + - filename: gb-build-dir.patch diff --git a/projects/gogb/gb-build-dir.patch b/projects/gogb/gb-build-dir.patch new file mode 100644 index 0000000..a52ca69 --- /dev/null +++ b/projects/gogb/gb-build-dir.patch @@ -0,0 +1,31 @@ +From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Tue, 6 Dec 2016 21:34:16 +0000 +Subject: [PATCH] Make the gb build directory deterministic + + +diff --git a/context.go b/context.go +index 53c00da..d040082 100644 +--- a/context.go ++++ b/context.go +@@ -3,7 +3,6 @@ package gb + import ( + "fmt" + "io" +- "io/ioutil" + "os" + "os/exec" + "path/filepath" +@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) { + }, + GcToolchain(), + } +- workdir, err := ioutil.TempDir("", "gb") ++ workdir := filepath.Join(os.TempDir(), "gb") ++ err := os.Mkdir(workdir, 0777) + if err != nil { + return nil, err + } +-- +2.10.2 + diff --git a/projects/release/config b/projects/release/config index 26dd8b7..527e269 100644 --- a/projects/release/config +++ b/projects/release/config @@ -75,6 +75,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-linux-x86_64 + - name: sandbox-linux-x86_64 + project: sandbox + enable: '[% c("var/torbrowser-linux-x86_64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-linux-x86_64 + - name: linux-i686 project: tor-browser enable: '[% c("var/torbrowser-linux-i686") %]' @@ -114,6 +121,7 @@ build: | [% END -%] [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt diff --git a/projects/sandbox/build b/projects/sandbox/build new file mode 100644 index 0000000..28b5a48 --- /dev/null +++ b/projects/sandbox/build @@ -0,0 +1,27 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/gogb') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +# we don't have access to the git repository during the build +sed -i Makefile -e 's|git rev-parse --short HEAD > data/revision|echo [% c("abbrev") %] > data/revision|' +# Unset GOOS and GOARCH as they change some file names, and we don't need +# them as we are only building on x86_64 +unset GOOS +unset GOARCH +make +cp bin/sandboxed-tor-browser $distdir + +cd $distdir/.. +[% c('zip', { + zip_src => [ project ], + zip_args => dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/sandbox/config b/projects/sandbox/config new file mode 100644 index 0000000..54fe4df --- /dev/null +++ b/projects/sandbox/config @@ -0,0 +1,29 @@ +# vim: filetype=yaml sw=2 +version: 0.0.3 +git_url: https://git.schwanenlied.me/yawning/sandboxed-tor-browser +git_hash: 'sandboxed-tor-browser-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfs4.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 +distribution: Debian-8.7 + +var: + deps: + - libx11-dev + - pkg-config + - libgtk-3-dev + - libnotify-dev + - zip + +targets: + nightly: + git_hash: master + tag_gpg_id: 0 + +input_files: + - project: docker-image + - name: go + project: go + - name: gogb + project: gogb

1 0

[tor-browser-bundle/master] No CXX needed for tor
by gk＠torproject.org 06 Feb '17

06 Feb '17

commit a8623422e47d1802a111e3fe8019b5984bec95be Author: Georg Koppen <gk(a)torproject.org> Date: Sat Feb 4 10:52:37 2017 +0000 No CXX needed for tor --- gitian/descriptors/mac/gitian-tor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index ee1d848..946f915 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -62,7 +62,6 @@ script: | CROSS_SYSROOT="/home/debian/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="/home/debian/build/clang/bin/clang $FLAGS" - export CXX="/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 LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"

1 0

[tor-browser-build/master] macosx-toolchain-gcc: add option to use 10.7 SDK
by boklm＠torproject.org 01 Feb '17

01 Feb '17

commit a226f20743c19cf7930264d76e0b914bd425cec5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 1 23:35:44 2017 +0100 macosx-toolchain-gcc: add option to use 10.7 SDK We need the 10.7 SDK to build GO. --- projects/macosx-toolchain-gcc/build | 1 + projects/macosx-toolchain-gcc/config | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build index 1b21d76..778194d 100644 --- a/projects/macosx-toolchain-gcc/build +++ b/projects/macosx-toolchain-gcc/build @@ -4,4 +4,5 @@ rootdir=$(pwd) destdir='[% dest_dir _ '/' _ c('filename') %]' mkdir -p "$destdir" mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb +mv -f [% c('input_files_by_name/SDK_10_7') %] "$destdir"/MacOSX10.7.sdk.tar.gz mv -f [% c('input_files_by_name/toolchain') %] "$destdir"/toolchain.tar.xz diff --git a/projects/macosx-toolchain-gcc/config b/projects/macosx-toolchain-gcc/config index 1a56401..31ac46f 100644 --- a/projects/macosx-toolchain-gcc/config +++ b/projects/macosx-toolchain-gcc/config @@ -6,7 +6,6 @@ var: setup: | macosx_toolchain_gcc_dir=/var/tmp/dist/macosx-toolchain-gcc mkdir -p $macosx_toolchain_gcc_dir - dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/toolchain.tar.xz export PATH="$macosx_toolchain_gcc_dir/apple-osx/bin:$PATH" # For OpenSSL @@ -14,15 +13,28 @@ var: #For gmp, need to trick it so it knows we're doing a 64 bit build for i in $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - # XXX Clean up these flags? - export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + + [% IF pc(c('origin_project'), "var/10_7_SDK") %] + export AR=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-ar + export CC=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc + export CXX=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-g++ + tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/MacOSX10.7.sdk.tar.gz + export CFLAGS="-isysroot $macosx_toolchain_gcc_dir/MacOSX10.7.sdk" + [% ELSE %] + dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir + # XXX Clean up these flags? + export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" + export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + [% END %] input_files: - name: SDK URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10… sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc + - name: SDK_10_7 + URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… + sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf - name: toolchain URL: https://people.torproject.org/~mikeperry/mirrors/sources/multiarch-darwin11… sha256sum: 65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9

1 0

[tor-browser-build/master] Add meek and obfs4
by boklm＠torproject.org 01 Feb '17

01 Feb '17

commit 9cbe67960c0d80f393a72715dab4fb32afed7094 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 1 23:50:33 2017 +0100 Add meek and obfs4 --- keyring/goptlib.gpg | Bin 0 -> 5876 bytes keyring/meek.gpg | Bin 0 -> 5876 bytes keyring/obfs4.gpg | Bin 0 -> 41312 bytes projects/ed25519/config | 18 ++++++++++ projects/go/build | 74 ++++++++++++++++++++++++++++++++++++++++ projects/go/config | 80 ++++++++++++++++++++++++++++++++++++++++++++ projects/goptlib/config | 18 ++++++++++ projects/goxcrypto/config | 24 +++++++++++++ projects/goxnet/config | 22 ++++++++++++ projects/meek/build | 49 +++++++++++++++++++++++++++ projects/meek/config | 15 +++++++++ projects/obfs4/build | 34 +++++++++++++++++++ projects/obfs4/config | 30 +++++++++++++++++ projects/siphash/config | 16 +++++++++ projects/tor-browser/build | 17 ++++++++-- projects/tor-browser/config | 4 +++ projects/uniuri/config | 20 +++++++++++ 17 files changed, 419 insertions(+), 2 deletions(-) diff --git a/keyring/goptlib.gpg b/keyring/goptlib.gpg new file mode 100644 index 0000000..f3b543f Binary files /dev/null and b/keyring/goptlib.gpg differ diff --git a/keyring/meek.gpg b/keyring/meek.gpg new file mode 100644 index 0000000..f3b543f Binary files /dev/null and b/keyring/meek.gpg differ diff --git a/keyring/obfs4.gpg b/keyring/obfs4.gpg new file mode 100644 index 0000000..f26a4cd Binary files /dev/null and b/keyring/obfs4.gpg differ diff --git a/projects/ed25519/config b/projects/ed25519/config new file mode 100644 index 0000000..5bab68b --- /dev/null +++ b/projects/ed25519/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/agl/ed25519.git +git_hash: c4161f4c7483313562781c61b9a20aba73daf9de +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/agl/ed25519 + go_lib_install: + - github.com/agl/ed25519/extra25519 + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/go/build b/projects/go/build new file mode 100644 index 0000000..2efd928 --- /dev/null +++ b/projects/go/build @@ -0,0 +1,74 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist + +[% IF c("var/linux") %] + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 +[% END %] + +mkdir -p /var/tmp/build + +# Building go 1.4.x +# This is needed to bootstrap the go that we actually use +# https://golang.org/doc/install/source#go14 +tar -C /var/tmp/build --transform='s,^go\>,go1.4,' -xf $rootdir/[% c('input_files_by_name/go14') %] +cd /var/tmp/build/go1.4/src +# Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. +# https://github.com/golang/go/issues/13114#issuecomment-186922245 +# Disable CC etc. that are set up for cross builds. +CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash +export GOROOT_BOOTSTRAP="/var/tmp/build/go1.4" + +cd $rootdir +[% IF ! c("var/linux") %] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END %] + +# Building go +# http://golang.org/doc/install/source#environment +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/go') %] +export GOROOT="$distdir" +cd /var/tmp/dist/go/src +[% IF c("var/linux") -%] + ./make.bash +[% ELSIF c("var/osx") -%] + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # 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 -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" + # http://golang.org/doc/install/source#environment + export GOOS=darwin + export GOARCH=386 + # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. + # https://github.com/golang/go/issues/17732 + sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash +[% ELSIF c("var/windows") -%] + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec i686-w64-mingw32-gcc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" + # http://golang.org/doc/install/source#environment + export GOOS=windows + export GOARCH=386 + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash +[% END -%] + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/go/config b/projects/go/config new file mode 100644 index 0000000..a5920f5 --- /dev/null +++ b/projects/go/config @@ -0,0 +1,80 @@ +# vim: filetype=yaml sw=2 +version: 1.7.4 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +var: + go14_version: 1.4.3 + + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] + export GOOS=[% c("var/GOOS") %] + export GOARCH=[% c("var/GOARCH") %] + export GOPATH=/var/tmp/dist/gopath + export PATH=/var/tmp/dist/go/bin:"$PATH" + + # Template build script for building a go library. + # This can be called as projects/go/var/build_go_lib. + # You need to define /var/go_lib, and optionaly var/go_lib_install as + # a list of install targets. + build_go_lib: | + #!/bin/bash + set -e + rootdir=$(pwd) + [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] + distdir=/var/tmp/dist/[% project %] + mkdir -p /var/tmp/build + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + mkdir -p $(dirname "$GOPATH/src/[% c("var/go_lib") %]") + mv /var/tmp/build/[% project %]-[% c('version') %] "$GOPATH/src/[% c("var/go_lib") %]" + cd "$GOPATH/src/[% c("var/go_lib") %]" + [% IF c("var/go_lib_install") -%] + [% FOREACH inst IN c("var/go_lib_install") %] + go install [% inst %] + [% END %] + [% ELSE %] + go install [% c("var/go_lib") %] + [% END %] + cd /var/tmp/dist + [% c('tar', { + tar_src => [ 'gopath' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] + +targets: + windows-i686: + var: + GOOS: windows + GOARCH: 386 + osx-x86_64: + var: + arch_deps: + - libc6-i386 + - libstdc++6:i386 + pre_pkginst: dpkg --add-architecture i386 + compiler: macosx-toolchain-gcc + 10_7_SDK: 1 + GOOS: darwin + GOARCH: 386 + linux: + var: + GOOS: linux + linux-x86_64: + var: + GOARCH: amd64 + linux-i686: + var: + GOARCH: 386 + +input_files: + - project: docker-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") || c("var/osx") %]' + - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' + name: go + sha256sum: 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc + - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' + name: go14 + sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/goptlib/config b/projects/goptlib/config new file mode 100644 index 0000000..dd520ec --- /dev/null +++ b/projects/goptlib/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: 0.5 +git_url: https://git.torproject.org/pluggable-transports/goptlib.git +git_hash: '[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: goptlib.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: git.torproject.org/pluggable-transports/goptlib.git + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config new file mode 100644 index 0000000..8362f28 --- /dev/null +++ b/projects/goxcrypto/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/crypto +git_hash: 4ed45ec682102c643324fae5dff8dab085b6c300 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: golang.org/x/crypto + go_lib_install: + - golang.org/x/crypto/curve25519 + - golang.org/x/crypto/hkdf + - golang.org/x/crypto/nacl/secretbox + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/goxnet/config b/projects/goxnet/config new file mode 100644 index 0000000..507f997 --- /dev/null +++ b/projects/goxnet/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/net +git_hash: 7dbad50ab5b31073856416cdcfeb2796d682f844 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: golang.org/x/net + go_lib_install: + - golang.org/x/net/proxy + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/meek/build b/projects/meek/build new file mode 100644 index 0000000..d195e90 --- /dev/null +++ b/projects/meek/build @@ -0,0 +1,49 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/osx") %] + PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" + DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/meek" +[% ELSE %] + PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" + DOCSDIR="$distdir/TorBrowser/Docs/meek" +[% END %] +mkdir -p $PTDIR $DOCSDIR + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +cd meek-client +go build -ldflags '-s' +cp -a meek-client[% IF c("var/windows") %].exe[% END %] $PTDIR + +cd ../meek-client-torbrowser +go build -ldflags '-s' +cp -a meek-client-torbrowser[% IF c("var/windows") %].exe[% END %] $PTDIR + + +[% IF c("var/windows") %] + cd ../terminateprocess-buffer + go build -ldflags '-s' + cp -a terminateprocess-buffer.exe $PTDIR +[% END %] + +cd .. +cp -a README doc/* $DOCSDIR + +cd firefox +[% c('zip', { + zip_src => [ '.' ], + zip_args => '$distdir/meek-http-helper(a)bamsoftware.com.xpi', + }) %] + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/meek/config b/projects/meek/config new file mode 100644 index 0000000..84ed2bd --- /dev/null +++ b/projects/meek/config @@ -0,0 +1,15 @@ +# vim: filetype=yaml sw=2 +version: 0.25 +git_url: https://git.torproject.org/pluggable-transports/meek.git +git_hash: '[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: meek.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +input_files: + - project: docker-image + - name: go + project: go + - name: goptlib + project: goptlib diff --git a/projects/obfs4/build b/projects/obfs4/build new file mode 100644 index 0000000..ff313e9 --- /dev/null +++ b/projects/obfs4/build @@ -0,0 +1,34 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/osx") %] + PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" +[% ELSE %] + PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" +[% END %] +mkdir -p $PTDIR + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" +ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" +cd obfs4proxy +go build -ldflags '-s' +cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/obfs4/config b/projects/obfs4/config new file mode 100644 index 0000000..952b054 --- /dev/null +++ b/projects/obfs4/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: 0.0.5 +git_url: https://git.torproject.org/pluggable-transports/obfs4.git +git_hash: 'obfs4proxy-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfs4.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +targets: + nightly: + git_hash: master + tag_gpg_id: 0 + +input_files: + - project: docker-image + - name: go + project: go + - name: goptlib + project: goptlib + - name: ed25519 + project: ed25519 + - name: siphash + project: siphash + - name: uniuri + project: uniuri + - name: goxcrypto + project: goxcrypto + - name: goxnet + project: goxnet diff --git a/projects/siphash/config b/projects/siphash/config new file mode 100644 index 0000000..0f3f4b5 --- /dev/null +++ b/projects/siphash/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/dchest/siphash.git +git_hash: 42ba037e748c9062a75e0924705c43b893edefcd +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/dchest/siphash + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/tor-browser/build b/projects/tor-browser/build index a5f9e1d..e25a1d8 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -52,7 +52,9 @@ mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton@torprojec mv [% c('input_files_by_name/https-everywhere') %] $TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi mv [% c('input_files_by_name/noscript') %] $TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi -# TODO: add meek xpi +tar -C $TBDIR -xf [% c('input_files_by_name/obfs4') %] +tar -C $TBDIR -xf [% c('input_files_by_name/meek') %] +mv $TBDIR/meek-http-helper(a)bamsoftware.com.xpi $TBDIR/$MEEKPROFILEPATH/extensions/ tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_files_by_name/fonts') %] @@ -105,7 +107,18 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b cp -a Bundle-Data/Docs $TBDIR/$DOCSPATH tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x -# TODO: install pluggable transports here +cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults +cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js + +[% IF c("var/osx") %] + pushd $TBDIR + # Create the meek-template-sha256sum.txt file by generating a list + # of hashes (one for each file within the meek-http-helper profile) and + # and then generating one final hash from the contents of the list. + sha256sum `find $MEEKPROFILEPATH -type f | sort` | sha256sum | sed -e 's/ *-$//' > $MEEKPROFILEPATH/meek-template-sha256sum.txt + popd +[% END %] [% IF c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 9ec262b..01463d9 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -42,6 +42,10 @@ input_files: name: https-everywhere - project: fonts name: fonts + - project: meek + name: meek + - project: obfs4 + name: obfs4 - filename: Bundle-Data - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript diff --git a/projects/uniuri/config b/projects/uniuri/config new file mode 100644 index 0000000..62fa8ef --- /dev/null +++ b/projects/uniuri/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/dchest/uniuri +git_hash: 8902c56451e9b58ff940bbe5fec35d5f9c04584a +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/dchest/uniuri + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go

1 0

[torbutton/maint-1.9.6] Bug 21330: Non-usable scrollbar appears in tor browser security settings
by gk＠torproject.org 01 Feb '17

01 Feb '17

commit 2a311617e1045cf5316fdab9aea1df9b1c7d02d4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 1 10:45:36 2017 -0500 Bug 21330: Non-usable scrollbar appears in tor browser security settings Wait until after the security settings window has finished loading before enabling the description box's scrollbar. --- src/chrome/content/preferences.js | 5 +++++ src/chrome/content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1f94dbb..1e47cad 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -41,6 +41,11 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; }; // Write the two prefs from the current settings. diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index bb6e31f..554312c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox flex="1" width="400" style="overflow: auto;"> + <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0