[Pkg-privacy-commits] [onionbalance] 101/117: Use Tor and Chutney from mainline repos

[Donncha O'Cearbahill]

This is an automated email from the git hooks/post-receive script.

donncha-guest pushed a commit to branch debian/sid
in repository onionbalance.

commit bc5c34c441d039d7da2a5aea342fda905b7498a7
Author: Donncha O'Cearbhaill <donncha at donncha.is>
Date:   Sat Nov 7 15:31:31 2015 +0100

    Use Tor and Chutney from mainline repos
---
 .travis.yml                     |  2 +-
 test/scripts/install-chutney.sh |  2 +-
 test/scripts/install-tor.sh     | 14 +++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7cc16aa..f6d95d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: python
+sudo: required
 env:
   - TOXENV=py27 TEST=functional
   - TOXENV=py34 TEST=functional
@@ -7,7 +8,6 @@ env:
 before_install:
   # Install tor and chutney if doing functional tests
   - if [[ $TEST == 'functional' ]]; then ./test/scripts/install-tor.sh; fi
-  - if [[ $TEST == 'functional' ]]; then export PATH=$PATH:$PWD/tor/src/tools:$PWD/tor/src/or; fi
   - if [[ $TEST == 'functional' ]]; then source test/scripts/install-chutney.sh; fi
 install:
   - pip install tox
diff --git a/test/scripts/install-chutney.sh b/test/scripts/install-chutney.sh
index 2a5167f..541bd8b 100755
--- a/test/scripts/install-chutney.sh
+++ b/test/scripts/install-chutney.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Script to install Chutney, configure a Tor network and wait for the hidden
 # service system to be available.
-git clone https://github.com/DonnchaC/chutney.git
+git clone https://git.torproject.org/chutney.git
 cd chutney
 # Stop chutney network if it is already running
 ./chutney stop networks/hs
diff --git a/test/scripts/install-tor.sh b/test/scripts/install-tor.sh
index 5aee64a..78b7856 100755
--- a/test/scripts/install-tor.sh
+++ b/test/scripts/install-tor.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Script to install Tor
 set -ex
-wget https://www.torproject.org/dist/tor-0.2.7.1-alpha.tar.gz
-tar -xzvf tor-0.2.7.1-alpha.tar.gz && mv tor-0.2.7.1-alpha tor
-cd tor && ./configure --disable-asciidoc && make
+echo "deb http://deb.torproject.org/torproject.org precise main" | sudo tee -a /etc/apt/sources.list
+echo "deb-src http://deb.torproject.org/torproject.org precise main" | sudo tee -a /etc/apt/sources.list
+echo "deb http://deb.torproject.org/torproject.org tor-experimental-0.2.7.x-precise main" | sudo tee -a /etc/apt/sources.list
+echo "deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.7.x-precise main" | sudo tee -a /etc/apt/sources.list
+
+# Install Tor repo signing key
+gpg --keyserver keys.gnupg.net --recv 886DDD89
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+
+sudo apt-get update -qq
+sudo apt-get install tor deb.torproject.org-keyring

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionbalance.git