From 14307ee7e7bf6020b6bbc6960375e47fdaa06583 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 14 Jun 2017 11:52:05 +0100
Subject: [PATCH] Return to tor debian package

---
 src/freedombone-image-customise | 14 ++------------
 src/freedombone-utils-onion     | 10 +---------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index dd5f8620..908c68e6 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -954,12 +954,7 @@ EOF
 
     if [[ $VARIANT == "usb" ]]; then
         # tor
-        echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
-        echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
-        chroot "$rootdir" gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
-        chroot "$rootdir" gpg --export $TOR_GPG_KEY | sudo apt-key add -
-        chroot "$rootdir" apt-get update
-        chroot "$rootdir" apt-get -yq install tor deb.torproject.org-keyring
+        chroot "$rootdir" apt-get -yq install tor
 
         # xmpp client
         chroot "$rootdir" echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list
@@ -1082,12 +1077,7 @@ function image_setup_utils {
     chroot "$rootdir" apt-get -yq install fail2ban vim-common python3 unattended-upgrades
 
     # Tor and ssh over tor
-    echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
-    echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
-    chroot "$rootdir" gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
-    chroot "$rootdir" gpg --export $TOR_GPG_KEY | sudo apt-key add -
-    chroot "$rootdir" apt-get update
-    chroot "$rootdir" apt-get -yq install tor deb.torproject.org-keyring connect-proxy
+    chroot "$rootdir" apt-get -yq install tor connect-proxy
     chroot "$rootdir" connect-proxy
     sed -i 's|#Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc
     sed -i 's|Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index f972c930..5f760ec9 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -31,9 +31,6 @@
 # The maximum amount of traffic per day in gigabytes
 TOR_MAX_TRAFFIC_PER_DAY_GB=3
 
-TOR_PACKAGE_UPSTREAM='http://deb.torproject.org/torproject.org'
-TOR_GPG_KEY='A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89'
-
 HIDDEN_SERVICE_PATH='/var/lib/tor/hidden_service_'
 
 function add_email_hostname {
@@ -272,12 +269,7 @@ function install_tor {
         return
     fi
 
-    echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a /etc/apt/sources.list.d/tor.list
-    echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a /etc/apt/sources.list.d/tor.list
-    gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
-    gpg --export $TOR_GPG_KEY | sudo apt-key add -
-    apt-get update
-    apt-get -yq install tor deb.torproject.org-keyring
+    apt-get -yq install tor
     if [ ! -f /etc/tor/torrc ]; then
         echo 'Tor failed to install'
         exit 38259