From b5e7c3b382841cce2267e018bf3b63e081452326 Mon Sep 17 00:00:00 2001
From: dimon <dimon@iron.home.local>
Date: Mon, 12 Aug 2024 18:19:41 +0000
Subject: [PATCH] Update 'setup_tor.sh'

---
 setup_tor.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setup_tor.sh b/setup_tor.sh
index d4b58d8..60ce4c4 100644
--- a/setup_tor.sh
+++ b/setup_tor.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 sh /setup_programs.sh
-apt install -y obfs4proxy apt-transport-https gpg
+apt install -y obfs4proxy
+
+wget --user ${FTP_USER} --password ${FTP_PASSWORD} ftp://${FTP_HOST}:${FTP_PORT}/libevent-2.1-6_2.1.8-stable-4build1_amd64.deb  -O /tmp/libevent.deb
+dpkg -i /tmp/libevent.deb
 
 # see https://deb.torproject.org/torproject.org/pool/main/t/tor/
 # see https://support.torproject.org/apt/tor-deb-repo/
-wget https://git.dfosd.synology.me/docker/ubuntu-tor/raw/branch/master/tor.list -O /etc/apt/sources.list.d/tor.list
-# https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc
-wget -qO- --user ${FTP_USER} --password ${FTP_PASSWORD} ftp://${FTP_HOST}:${FTP_PORT}/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor | tee /usr/share/keyrings/deb.torproject.org-keyring.gpg >/dev/null
-
-apt update
-apt install -y tor deb.torproject.org-keyring
+wget --user ${FTP_USER} --password ${FTP_PASSWORD} ftp://${FTP_HOST}:${FTP_PORT}/tor_0.4.8.12-1~bionic+1_amd64.deb -O /tmp/tor.deb
+dpkg -i /tmp/tor.deb
 
 rm /etc/tor/torrc
 wget https://git.dfosd.synology.me/docker/ubuntu-tor/raw/branch/master/torrc -O /etc/tor/torrc
\ No newline at end of file