diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index 7cc33b4f7832b1f90f82a7ea1fda714593f1f984..0a853c4dc67bed6981333db0fcec5fa9c51aa592 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -17,7 +17,7 @@ # License # ======= # -# Copyright (C) 2014-2017 Bob Mottram <bob@freedombone.net> +# Copyright (C) 2014-2018 Bob Mottram <bob@freedombone.net> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index fa399cd81c19e0cd59e19aa3ce03af30cb2eae3e..7e9410b3fb7f08b14524d9e182a95b9b5861b83a 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -909,7 +909,7 @@ initialise_mesh() { chroot "$rootdir" apt-get -yq install apt-transport-https # install tor as a possible way of routing traffic between internet gateways - chroot "$rootdir" apt-get -yq install tor + chroot "$rootdir" apt-get -yq -t stretch-backports install tor # dhcp daemon for hotspot on secondary wifi adapter chroot "$rootdir" apt-get -yq install dnsmasq diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade index 50a73033405fb9803283720992440de4e6355006..35ad41e4832b11f7c4a1780df7bb1612b0bf9312 100755 --- a/src/freedombone-upgrade +++ b/src/freedombone-upgrade @@ -97,6 +97,12 @@ if [ -d $PROJECT_DIR ]; then email_install_tls email_disable_chunking #defrag_filesystem + + # reinstall tor from backports + tor_version=$(tor --version) + if [[ "$tor_version" == *' 0.2'* ]]; then + apt-get -yq -t stretch-backports install tor + fi fi fi diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion index e90a3ab561ded89f79082546e5320f5587218792..83d5338dd65787fc877c0ba3708877b9f8d6530f 100755 --- a/src/freedombone-utils-onion +++ b/src/freedombone-utils-onion @@ -270,7 +270,7 @@ function install_tor { return fi - apt-get -yq install tor + apt-get -yq -t stretch-backports install tor if [ ! -f /etc/tor/torrc ]; then echo 'Tor failed to install' exit 38259