- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 18331: add /usr/sbin:/sbin to the PATH
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 8c71dad38b58aa138872d1f8827ea2813763ab1b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 11 19:28:16 2016 +0200 Bug 18331: add /usr/sbin:/sbin to the PATH On Debian wheezy, dpkg -i fails when the PATH does not include /sbin and /usr/sbin, so we add them. As a policy, Debian does not include them by default in regular users PATH. This change is not required when building using LXC as the commands are run using sudo which overrides the PATH with the value in "secure_path" which includes sbin directories. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 ++ gitian/descriptors/mac/gitian-tor.yml | 2 ++ gitian/descriptors/mac/gitian-utils.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index e2b51c4..6b1a99e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -79,6 +79,8 @@ script: | mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # + # 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/" diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 94d3eb1..687b1d6 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -43,6 +43,8 @@ script: | mkdir -p $TORCONFIGDIR/ mkdir -p $OUTDIR/ # + # 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/" diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 5288471..cef1533 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -71,6 +71,8 @@ script: | export FAKETIME=$REFERENCE_DATETIME cd .. + # 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/"

1 0

[gitian-builder/tor-browser-builder-4] Bug 18331: install sudo in Debian VMs with KVM too
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit ae90ac520dbdf6b1267b099b654b58352ee86ef0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 8 13:45:55 2016 +0200 Bug 18331: install sudo in Debian VMs with KVM too --- bin/make-base-vm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index fe1df94..59f0734 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -118,11 +118,12 @@ if [ $DISTRO = "ubuntu" ]; then GRUB_PKG=grub-pc fi +if [ $DISTRO = "debian" ]; then + addpkg=$addpkg,sudo +fi + if [ $LXC = "1" ]; then addpkg=$addpkg,lxc - if [ $DISTRO = "debian" ]; then - addpkg=$addpkg,sudo - fi else # Lack of comma after KERNEL_PKG is not a typo addpkg=$addpkg,${KERNEL_PKG}${GRUB_PKG},openssh-server

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: install debian-archive-keyring on Ubuntu
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 770346a8468f18bbb395c695208118c1dc6c6f2d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 1 12:39:33 2016 +0100 Bug 18127: install debian-archive-keyring on Ubuntu The Debian keyring is required by debootstrap when generating a Debian chroot. --- gitian/check-prerequisites.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index a5f8393..6b88a90 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | 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 torsocks tor 2>/dev/null >/dev/null + 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 if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring" exit 1 fi else

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: use $GITIAN_TAG in fetch-inputs.sh
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 954e6d2d88c49fe7f243aa90b47e56ff616daf7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 16 19:30:02 2016 +0100 Bug 18127: use $GITIAN_TAG in fetch-inputs.sh --- gitian/fetch-inputs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 5aed842..7c9daee 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -243,8 +243,7 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout tor-browser-builder-3 -git merge origin/tor-browser-builder-3 +git checkout "$GITIAN_TAG" cd inputs while read dir url tag; do

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: Add LXC support for building with Debian guest VMs
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit f02e6d9110b390f97af0dd8c0ee3b525f6e5d8b8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 7 12:59:46 2016 +0100 Bug 18127: Add LXC support for building with Debian guest VMs --- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/linux/gitian-pluggable-transports.yml | 2 +- gitian/make-vms.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fdc1bf6..b9bf0f9 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -14,6 +14,7 @@ packages: - "libxml2-utils" - "sqlite3" - "python-lxml" +- "rsync" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a886572..3aaec92 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -146,7 +146,7 @@ script: | # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . - mkdir vcversioner-1.14.1.1-py2.6.egg + mkdir vcversioner-1.14.1.1-py2.7.egg $PYTHON setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 469a9ca..554cc27 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,13 +25,20 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch.qcow2 ]; + if [ ! -f ./base-$dist-$arch ]; then if [ "z$USE_LXC" = "z1" ]; then export LXC_SUITE=$dist export LXC_ARCH=$arch - ./bin/make-base-vm --suite $dist --lxc --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --lxc --arch $arch + fi else if [ "$dist" = "wheezy" ]; then

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: fix base-vm file name when using KVM
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit eb7ae40c498029994daa38d48a64a152ca1129e1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 29 17:27:41 2016 +0200 Bug 18127: fix base-vm file name when using KVM The base-vm file name is different if we are using LXC or KVM. --- gitian/make-vms.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 554cc27..089865b 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,7 +25,8 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch ]; + if [ "z$USE_LXC" = "z1" -a ! -f ./base-$dist-$arch ] \ + || [ "z$USE_LXC" != "z1" -a ! -f ./base-$dist-$arch.qcow2 ]; then if [ "z$USE_LXC" = "z1" ]; then

1 0

[tor-browser-bundle/hardened-builds] Bug 18698: Include libgconf2-dev for our Linux builds
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 988566ec934df8b440bc83cee5b6ac34a21149fe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 1 01:16:09 2016 +0000 Bug 18698: Include libgconf2-dev for our Linux builds --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index c49636a..d21b342 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -19,6 +19,8 @@ packages: - "python-dev" # To pass configure since ESR 31. - "libpulse-dev" +# To pass configure since ESR 45. +- "libgconf2-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00"

1 0

[tor-browser-bundle/hardened-builds] Bumping gitian-builder tag for nightlies
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit db4f5aa9836c36f3cad96c3677bd058f5a9cd19c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 29 12:26:41 2016 +0000 Bumping gitian-builder tag for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 43c3c9a..e7c5b3d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,7 +43,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[torbutton/master] Bug 18466: Make Torbutton compatible with ESR45
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit e4f7079dd5d4ae44b8d10b48889d165eba20a660 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 7 09:51:05 2016 +0000 Bug 18466: Make Torbutton compatible with ESR45 Our usage of |let| does not work anymore since changes in Firefox 44 landed. See: https://bugzilla.mozilla.org/show_bug.cgi?id=589199. --- src/components/domain-isolator.js | 6 +++--- src/modules/tor-control-port.js | 2 +- src/modules/utils.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 2639322..6cfd21e 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -30,7 +30,7 @@ mozilla.protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1 // 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. @@ -63,7 +63,7 @@ tor.unknownDirtySince = Date.now(); // __tor.socksProxyCredentials(originalProxy, domain)__. // Takes a proxyInfo object (originalProxy) and returns a new proxyInfo -// object with the same properties, except the username is set to the +// object with the same properties, except the username is set to the // the domain, and the password is a nonce. tor.socksProxyCredentials = function (originalProxy, domain) { // Check if we already have a nonce. If not, create @@ -113,7 +113,7 @@ tor.isolateCircuitsByDomain = function () { proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " + - replacementProxy.username + ":" + replacementProxy.password); + replacementProxy.username + ":" + replacementProxy.password); return replacementProxy; } catch (err) { logger.eclog(3, err.message); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 1cef898..63c2cd9 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -641,7 +641,7 @@ tor.controller = function (host, port, password, onError) { // let replyPromise = c.getInfo("ip-to-country/16.16.16.16"); // // Close the controller permanently // c.close(); -let controller = function (host, port, password, onError) { +var controller = function (host, port, password, onError) { let dest = host + ":" + port, maybeController = tor.controllerCache[dest]; return (tor.controllerCache[dest] = diff --git a/src/modules/utils.js b/src/modules/utils.js index de3cca6..eb0746b 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -14,7 +14,7 @@ let prefs = Services.prefs; // __getPrefValue(prefName)__ // Returns the current value of a preference, regardless of its type. -let getPrefValue = function (prefName) { +var getPrefValue = function (prefName) { switch(prefs.getPrefType(prefName)) { case prefs.PREF_BOOL: return prefs.getBoolPref(prefName); case prefs.PREF_INT: return prefs.getIntPref(prefName); @@ -27,7 +27,7 @@ let getPrefValue = function (prefName) { // Applies prefHandler to the current value of pref specified by prefName. // Re-applies prefHandler whenever the value of the pref changes. // Returns a zero-arg function that unbinds the pref. -let bindPrefAndInit = function (prefName, prefHandler) { +var bindPrefAndInit = function (prefName, prefHandler) { let update = () => { prefHandler(getPrefValue(prefName)); }, observer = { observe : function (subject, topic, data) { if (data === prefName) { @@ -48,7 +48,7 @@ let env = Components.classes["@mozilla.org/process/environment;1"] // __getEnv(name)__. // Reads the environment variable of the given name. -let getEnv = function (name) { +var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; };

1 0

[torbutton/master] Bug 18466: Prevent ReferenceErrors in tor-control-port.js
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit e6939a0043b8fc944ecfa4559efbd503d1d758c1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 2 17:27:25 2016 -0800 Bug 18466: Prevent ReferenceErrors in tor-control-port.js --- src/modules/tor-control-port.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index e1ee6bc..1cef898 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -39,7 +39,7 @@ log("Loading tor-control-port.js\n"); // ## io // I/O utilities namespace -let io = io || {}; +let io = {}; // __io.asyncSocketStreams(host, port)__. // Creates a pair of asynchronous input and output streams for a socket at the @@ -286,7 +286,7 @@ io.controlSocket = function (host, port, password, onError) { // ## utils // A namespace for utility functions -let utils = utils || {}; +let utils = {}; // __utils.identity(x)__. // Returns its argument unchanged. @@ -390,7 +390,7 @@ utils.rejectPromise = errorMessage => Promise.reject(new Error(errorMessage)); // ## info // A namespace for functions related to tor's GETINFO and GETCONF command. -let info = info || {}; +let info = {}; // __info.keyValueStringsFromMessage(messageText)__. // Takes a message (text) response to GETINFO or GETCONF and provides @@ -567,7 +567,7 @@ info.getConf = function (aControlSocket, key) { // ## event // Handlers for events -let event = event || {}; +let event = {}; // __event.parsers__. // A map of EVENT keys to parsing functions, which convert result strings to JavaScript @@ -603,7 +603,7 @@ event.watchEvent = function (controlSocket, type, filter, onData) { // ## tor // Things related to the main controller. -let tor = tor || {}; +let tor = {}; // __tor.controllerCache__. // A map from "host:port" to controller objects. Prevents redundant instantiation

1 0